Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2009 04:08:20 +0000 (21:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2009 04:08:20 +0000 (21:08 -0700)
Conflicts:
drivers/scsi/fcoe/fcoe.c

23 files changed:
1  2 
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/atl1c/atl1c_main.c
drivers/net/benet/be_main.c
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_main.c
drivers/net/meth.c
drivers/net/mv643xx_eth.c
drivers/net/vxge/vxge-traffic.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rtl818x/rtl8187.h
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/pci/quirks.c
drivers/platform/x86/sony-laptop.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/libfcoe.c
include/linux/pci_ids.h
net/mac80211/rc80211_minstrel.c
net/mac80211/rc80211_pid_algo.c
net/rds/rds.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 158827e50c55a2b3096ebede917c92e78affbb7c,bac6cfba6abd412874b3a289331cd6659ed5a225..6499ccc34c942619fc65f8ea50440c43bfb291bf
@@@ -1498,14 -1512,10 +1506,16 @@@ static int __devinit rtl8187_probe(stru
               wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
               chip_name, priv->asic_rev, priv->rf->name);
  
 +#ifdef CONFIG_RTL8187_LEDS
 +      eeprom_93cx6_read(&eeprom, 0x3F, &reg);
 +      reg &= 0xFF;
 +      rtl8187_leds_init(dev, reg);
 +#endif
 +
        return 0;
  
+  err_free_dmabuf:
+       kfree(priv->io_dmabuf);
   err_free_dev:
        ieee80211_free_hw(dev);
        usb_set_intfdata(intf, NULL);
Simple merge
Simple merge
index f2d16127bd0ac34ea962609ff3a354c55fb8f68b,03e1926f40b523c231033e809031ad9b1d138ec7..ce33f107b0a00d4b562fde4ced6dd15ea193e359
@@@ -349,8 -255,7 +348,9 @@@ static int fcoe_netdev_config(struct fc
        rtnl_lock();
        memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
        dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN);
 +      if (fc->ctlr.spma)
 +              dev_unicast_add(fc->real_dev, fc->ctlr.ctl_src_addr, ETH_ALEN);
+       dev_mc_add(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
        rtnl_unlock();
  
        /*
@@@ -470,7 -370,17 +470,7 @@@ static int fcoe_if_destroy(struct net_d
        if (lp->emp)
                fc_exch_mgr_free(lp->emp);
  
-       /* Free the per-CPU revieve threads */
 -      /* Delete secondary MAC addresses */
 -      rtnl_lock();
 -      memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN);
 -      dev_unicast_delete(fc->real_dev, flogi_maddr, ETH_ALEN);
 -      if (!is_zero_ether_addr(fc->ctlr.data_src_addr))
 -              dev_unicast_delete(fc->real_dev,
 -                                 fc->ctlr.data_src_addr, ETH_ALEN);
 -      dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0);
 -      rtnl_unlock();
 -
+       /* Free the per-CPU receive threads */
        fcoe_percpu_clean(lp);
  
        /* Free existing skbs */
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/rds/rds.h
Simple merge