22 Jul, 2011

40 commits

• 36bcfe7d7   stmmac: unify MAC and PHY configuration parameters (V2) ... Browse Code »

  Prior to this change, most PHY configuration parameters were passed
  into the STMMAC device as a separate PHY device. As well as being
  unusual, this made it difficult to make changes to the MAC/PHY
  relationship.

  This patch moves all the PHY parameters into the MAC configuration
  structure, mainly as a separate structure. This allows us to completely
  ignore the MDIO bus attached to a stmmac if desired, and not create
  the PHY bus. It also allows the stmmac driver to use a different PHY
  from the one it is connected to, for example a fixed PHY or bit banging
  PHY.

  Also derive the stmmac/PHY connection type (MII/RMII etc) from the
  mode can be passed into _configure_ethernet.
  STLinux kernel at git://git.stlinux.com/stm/linux-sh4-2.6.32.y.git
  provides several examples how to use this new infrastructure (that
  actually is easier to maintain and clearer).

  Signed-off-by: Stuart Menefy
  Signed-off-by: Giuseppe Cavallaro
  Signed-off-by: David S. Miller

  Giuseppe CAVALLARO

  2011-07-22 06:29:16 +0800  
• f3240e281   stmmac: remove warning when compile as built-in (V2) ... Browse Code »

  The patch removes the following serie of warnings
  when the driver is compiled as built-in:

  drivers/net/stmmac/stmmac_main.c: In function stmmac_cmdline_opt:
  drivers/net/stmmac/stmmac_main.c:1855:12: warning: ignoring return
  value of kstrtoul, declared with attribute warn_unused_result
  [snip]

  Signed-off-by: Giuseppe Cavallaro
  Signed-off-by: David S. Miller

  Giuseppe CAVALLARO

  2011-07-22 06:29:16 +0800  
• 3bec5dcc6   stmmac: update the version (V2) ... Browse Code »

  Signed-off-by: Giuseppe Cavallaro
  Signed-off-by: David S. Miller

  Giuseppe CAVALLARO

  2011-07-22 06:29:16 +0800  
• 67ae7cf1e   ethtool: Allow zero-length register dumps again ... Browse Code »

  Some drivers (ab)use the ethtool_ops::get_regs operation to expose
  only a hardware revision ID. Commit
  a77f5db361ed9953b5b749353ea2c7fed2bf8d93 ('ethtool: Allocate register
  dump buffer with vmalloc()') had the side-effect of breaking these, as
  vmalloc() returns a null pointer for size=0 whereas kmalloc() did not.

  For backward-compatibility, allow zero-length dumps again.

  Reported-by: Kalle Valo
  Signed-off-by: Ben Hutchings
  Cc: stable@kernel.org [2.6.37+]
  Signed-off-by: David S. Miller

  Ben Hutchings

  2011-07-22 06:25:30 +0800  
• 1511022c9   skbuff: fix error handling in pskb_copy() ... Browse Code »

  There are two problems:
  1) "n" was allocated with alloc_skb() so we should free it with
  kfree_skb() instead of regular kfree().
  2) We return the freed pointer instead of NULL.

  Signed-off-by: Dan Carpenter
  Reviewed-by: Eric Dumazet
  Signed-off-by: David S. Miller

  Dan Carpenter

  2011-07-22 05:47:54 +0800  
• 536d1d4a0   vlan: move vlan_group_[gs]et_device to public header ... Browse Code »

  there are no users outside vlan code

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:58 +0800  
• 7890a5b9c   vlan: kill ndo_vlan_rx_register ... Browse Code »

  has no users so remove it

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:58 +0800  
• 4f7a4505f   macvlan: do vlan cleanup ... Browse Code »

  ndo_vlan_rx_register is no longer in use in any driver so remove it.

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:58 +0800  
• cc0e40700   bonding: do vlan cleanup ... Browse Code »

  Now when all devices are cleaned up, bond can be cleaned up as well

  - remove bond->vlgrp
  - remove bond_vlan_rx_register
  - substitute necessary occurences of vlan_group_get_device

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:58 +0800  
• 9d846fec2   staging: et131x: remove unused prototype et131x_vlan_rx_register ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 223bb15e4   qlcnic: remove usage of vlan_group_get_device ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 5526c0313   stmmac: do vlan cleanup ... Browse Code »

  - kill priv->vlgrp and stmmac_vlan_rx_register (used for nothing :))

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• ffcf9b767   vlan: kill vlan_gro_frags and vlan_gro_receive ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 7ff0bcf67   qeth: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill card->vlangrp and qeth_l3_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 535157348   vxge: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill vdev->vlgrp and vxge_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• b2cb09b1a   igb: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and igb_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 3326c784c   forcedeth: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill np->vlangrp and nv_vlan_rx_register
  - allow to turn on/off rx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• 5622e4044   e1000: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and e1000_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:57 +0800  
• a4aeb2662   vlan: kill __vlan_hwaccel_rx and vlan_hwaccel_rx ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 892ef5d85   cxgb3: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill pi->vlan_grp and vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• dc437974a   atl2: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and atl2_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 924917098   atl1: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and atlx_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• a4f676b80   ns83820: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill dev->vlgrp and ns83820_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 5da96be53   starfire: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill np->vlgrp and netdev_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 73b546888   via-velocity: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill vptr->vlgrp and velocity_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 08dddfc3f   acenic: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill ap->vlgrp and ace_vlan_rx_register
  - enable vlan hw accel always (kill vlan ifdefs)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• dadcd65f5   ixgbevf: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and ixgbevf_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 6dacaddd4   vlan: kill vlan_hwaccel_receive_skb ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:56 +0800  
• 312cd5135   tehuti: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill priv->vlgrp and bdx_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• 9c5d06142   spider_net: do not mention dying vlan_hwaccel_receive_skb ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• b85da2c00   s2io: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill sp->vlgrp and s2io_vlan_rx_register and s2io_vlan_rx_kill_vid
  (which does nothing and is never called :))

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• 18c49b917   qlge: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan path
  - kill qdev->vlgrp and qlge_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• f1b553fbe   mlx4: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan path
  - kill priv->vlgrp and mlx4_en_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• 5043f5057   jme: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill jme->vlgrp and jme_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• a0f1d603e   igbvf: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlgrp and igbvf_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• 87c288c6e   gianfar: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill priv->vlgrp and gfar_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• 6ede746b6   enic: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill enic->vlan_group and enic_vlan_rx_register

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:55 +0800  
• c74ea2f75   cxgb4: remove forgotten unused vlan_group ... Browse Code »

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:54 +0800  
• 87737663d   cxgb4vf: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill pi->vlan_grp and cxgb4vf_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:54 +0800  
• 133b08513   chelsio: do vlan cleanup ... Browse Code »

  - unify vlan and nonvlan rx path
  - kill adapter->vlan_grp and t1_vlan_rx_register
  - allow to turn on/off rx/tx vlan accel via ethtool (set_features)

  Signed-off-by: Jiri Pirko
  Signed-off-by: David S. Miller

  Jiri Pirko

  2011-07-22 04:47:54 +0800