From: David S. Miller <davem@davemloft.net>
Date: Tue, 19 May 2009 04:08:20 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.31-rc1~330^2~371
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2.6.30-rc6-02911-gbb803cf;p=karo-tx-linux.git

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

Conflicts:
	drivers/scsi/fcoe/fcoe.c
---

bb803cfbecb03a0cf8dc7e1864f18dda6631af00
diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
index 158827e50c55,bac6cfba6abd..6499ccc34c94
--- a/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/scsi/fcoe/fcoe.c
index f2d16127bd0a,03e1926f40b5..ce33f107b0a0
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@@ -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 */