Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 10 Mar 2011 22:26:00 +0000 (14:26 -0800)]
Conflicts:
drivers/net/bnx2x/bnx2x_cmn.c

17 files changed:
1  2 
MAINTAINERS
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_cmn.c
drivers/net/bnx2x/bnx2x_cmn.h
drivers/net/bnx2x/bnx2x_ethtool.c
drivers/net/bnx2x/bnx2x_main.c
drivers/net/macvtap.c
include/linux/netdevice.h
net/core/dev.c
net/core/pktgen.c
net/ipv4/devinet.c
net/ipv4/ip_gre.c
net/ipv4/ipip.c
net/ipv6/ip6_tunnel.c
net/ipv6/route.c
net/ipv6/sit.c
net/unix/af_unix.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/ipip.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/sit.c
Simple merge
Simple merge