Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/scsi/fcoe/fcoe.c

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/net/benet/be_main.c
Simple merge

diff --cc drivers/net/bonding/bond_3ad.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/meth.c
Simple merge

diff --cc drivers/net/mv643xx_eth.c
Simple merge

diff --cc drivers/net/vxge/vxge-traffic.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/pci.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187.h
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
index 158827e,bac6cfb..6499ccc
--- 1/drivers/net/wireless/rtl818x/rtl8187_dev.c
--- 2/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@@ -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);

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/platform/x86/sony-laptop.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
index f2d1612,03e1926..ce33f10
--- 1/drivers/scsi/fcoe/fcoe.c
--- 2/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@@ -136,61 -136,8 +136,60 @@@ static struct scsi_host_template fcoe_s
  };
  
  /**
 + * fcoe_fip_recv - handle a received FIP frame.
 + * @skb: the receive skb
 + * @dev: associated &net_device
 + * @ptype: the &packet_type structure which was used to register this handler.
 + * @orig_dev: original receive &net_device, in case @dev is a bond.
 + *
 + * Returns: 0 for success
 + */
 +static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *dev,
 +                       struct packet_type *ptype,
 +                       struct net_device *orig_dev)
 +{
 +      struct fcoe_softc *fc;
 +
 +      fc = container_of(ptype, struct fcoe_softc, fip_packet_type);
 +      fcoe_ctlr_recv(&fc->ctlr, skb);
 +      return 0;
 +}
 +
 +/**
 + * fcoe_fip_send() - send an Ethernet-encapsulated FIP frame.
 + * @fip: FCoE controller.
 + * @skb: FIP Packet.
 + */
 +static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
 +{
 +      skb->dev = fcoe_from_ctlr(fip)->real_dev;
 +      dev_queue_xmit(skb);
 +}
 +
 +/**
 + * fcoe_update_src_mac() - Update Ethernet MAC filters.
 + * @fip: FCoE controller.
 + * @old: Unicast MAC address to delete if the MAC is non-zero.
 + * @new: Unicast MAC address to add.
 + *
 + * Remove any previously-set unicast MAC filter.
 + * Add secondary FCoE MAC address filter for our OUI.
 + */
 +static void fcoe_update_src_mac(struct fcoe_ctlr *fip, u8 *old, u8 *new)
 +{
 +      struct fcoe_softc *fc;
 +
 +      fc = fcoe_from_ctlr(fip);
 +      rtnl_lock();
 +      if (!is_zero_ether_addr(old))
 +              dev_unicast_delete(fc->real_dev, old, ETH_ALEN);
 +      dev_unicast_add(fc->real_dev, new, ETH_ALEN);
 +      rtnl_unlock();
 +}
 +
 +/**
   * fcoe_lport_config() - sets up the fc_lport
   * @lp: ptr to the fc_lport
-  * @shost: ptr to the parent scsi host
   *
   * Returns: 0 for success
   */
@@@ -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 */

diff --cc drivers/scsi/fcoe/libfcoe.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc net/mac80211/rc80211_minstrel.c
Simple merge

diff --cc net/mac80211/rc80211_pid_algo.c
Simple merge

diff --cc net/rds/rds.h
Simple merge