From: David S. Miller <davem@davemloft.net>
Date: Thu, 10 Mar 2011 22:26:00 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: upstream/snapshot3+hdmi~11215^2~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33175d84ee3fa29991adb80513683e010769e807;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bnx2x/bnx2x_cmn.c
---

33175d84ee3fa29991adb80513683e010769e807
diff --cc drivers/net/bnx2x/bnx2x_cmn.c
index b01b622,a71b329..e83ac6d
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@@ -1489,15 -1481,11 +1506,20 @@@ int bnx2x_nic_load(struct bnx2x *bp, in
  
  	bnx2x_set_eth_mac(bp, 1);
  
 +	/* Clear MC configuration */
 +	if (CHIP_IS_E1(bp))
 +		bnx2x_invalidate_e1_mc_list(bp);
 +	else
 +		bnx2x_invalidate_e1h_mc_list(bp);
 +
 +	/* Clear UC lists configuration */
 +	bnx2x_invalidate_uc_list(bp);
 +
+ 	if (bp->pending_max) {
+ 		bnx2x_update_max_mf_config(bp, bp->pending_max);
+ 		bp->pending_max = 0;
+ 	}
+ 
  	if (bp->port.pmf)
  		bnx2x_initial_phy_init(bp, load_mode);