1. 28 7月, 2010 5 次提交
  2. 27 7月, 2010 10 次提交
  3. 26 7月, 2010 5 次提交
  4. 25 7月, 2010 2 次提交
  5. 24 7月, 2010 14 次提交
  6. 23 7月, 2010 4 次提交
    • D
      stmmac: handle allocation errors in setup functions · 1ff21906
      Dan Carpenter 提交于
      If the allocations fail in either dwmac1000_setup() or dwmac100_setup()
      then return NULL.  These are called from stmmac_mac_device_setup().  The
      check for NULL returns in stmmac_mac_device_setup() needed to be moved
      forward a couple lines.
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1ff21906
    • J
      bonding: don't lock when copying/clearing VLAN list on slave · 03dc2f4c
      Jay Vosburgh 提交于
      When copying VLAN information to or removing from a slave
      during slave addition or removal, the bonding code currently holds
      the bond->lock for write to prevent concurrent modification of the
      vlan_list / vlgrp.
      
      	This is unnecessary, as all of these operations occur under
      RTNL.  Holding the bond->lock also caused might_sleep issues for
      some drivers' ndo_vlan_* functions.  This patch removes the extra
      locking.
      
      	Problem reported by Michael Chan <mchan@broadcom.com>
      Signed-off-by: NJay Vosburgh <fubar@us.ibm.com>
      Cc: Michael Chan <mchan@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      03dc2f4c
    • J
      bonding: change test for presence of VLANs · f35188fa
      Jay Vosburgh 提交于
      After commit ad1afb00
      ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)")
      it is now regular practice for a VLAN "add vid" for VLAN 0 to
      arrive prior to any VLAN registration or creation of a vlan_group.
      
      	This patch updates the bonding code that tests for the presence
      of VLANs configured above bonding.  The new logic tests for bond->vlgrp
      to determine if a registration has occured, instead of testing that
      bonding's internal vlan_list is empty.
      
      	The old code would panic when vlan_list was not empty, but
      vlgrp was still NULL (because only an "add vid" for VLAN 0 had occured).
      
      	Bonding still adds VLAN 0 to its internal list so that 802.1p
      frames are handled correctly on transmit when non-VLAN accelerated
      slaves are members of the bond.  The test against bond->vlan_list
      remains in bond_dev_queue_xmit for this reason.
      
      	Modification to the bond->vlgrp now occurs under lock (in
      addition to RTNL), because not all inspections of it occur under RTNL.
      
      	Additionally, because 8021q will never issue a "kill vid" for
      VLAN 0, there is now logic in bond_uninit to release any remaining
      entries from vlan_list.
      Signed-off-by: NJay Vosburgh <fubar@us.ibm.com>
      Cc: Pedro Garcia <pedro.netdev@dondevamos.com>
      Cc: Patrick McHardy <kaber@trash.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f35188fa
    • W
      net/fec: restore interrupt mask after software-reset in fec_stop() · 4bee1f9a
      Wolfram Sang 提交于
      After the change from mdio polling to irq, it became necessary to
      restore the interrupt mask after resetting the chip in fec_stop().
      Otherwise, with all irqs disabled, no communication with the PHY will be
      possible after e.g. un-/replugging the cable and the device gets
      stalled.
      Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4bee1f9a