Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Sat, 10 Nov 2012 23:32:51 +0000 (18:32 -0500)]
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

34 files changed:
1  2 
MAINTAINERS
arch/arm/mach-at91/Kconfig
arch/m68k/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
arch/xtensa/include/uapi/asm/socket.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/micrel/ksz884x.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/qlogic/qla3xxx.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/ti/Kconfig
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/vxlan.c
drivers/vhost/net.c
include/uapi/linux/usb/cdc.h
net/core/dev.c
net/core/rtnetlink.c
net/core/skbuff.c
net/ipv4/inet_diag.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_timer.c
net/ipv6/ip6_gre.c
net/ipv6/ndisc.c
net/ipv6/route.c
net/sctp/socket.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -12065,10 -11899,22 +12066,20 @@@ static int __devinit bnx2x_init_one(str
        /* calc qm_cid_count */
        bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
  
 -#ifdef BCM_CNIC
 -      /* disable FCOE L2 queue for E1x */
 +      /* disable FCOE L2 queue for E1x*/
        if (CHIP_IS_E1x(bp))
                bp->flags |= NO_FCOE_FLAG;
 +
+       /* disable FCOE for 57840 device, until FW supports it */
+       switch (ent->driver_data) {
+       case BCM57840_O:
+       case BCM57840_4_10:
+       case BCM57840_2_20:
+       case BCM57840_MFO:
+       case BCM57840_MF:
+               bp->flags |= NO_FCOE_FLAG;
+       }
 -#endif
 -
        /* Set bp->num_queues for MSI-X mode*/
        bnx2x_set_num_queues(bp);
  
@@@ -1349,14 -1353,13 +1349,17 @@@ static int gfar_restore(struct device *
        struct gfar_private *priv = dev_get_drvdata(dev);
        struct net_device *ndev = priv->ndev;
  
-       if (!netif_running(ndev))
+       if (!netif_running(ndev)) {
+               netif_device_attach(ndev);
                return 0;
+       }
  
 -      gfar_init_bds(ndev);
 +      if (gfar_init_bds(ndev)) {
 +              free_skb_resources(priv);
 +              return -ENOMEM;
 +      }
 +
        init_registers(ndev);
        gfar_set_mac_address(ndev);
        gfar_init_mac(ndev);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
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/tcp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge