Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Mon, 19 Mar 2012 03:29:41 +0000 (23:29 -0400)]
17 files changed:
1  2 
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/tun.c
drivers/net/usb/asix.c
drivers/net/usb/usbnet.c
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/iwlegacy/3945.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/ipv4/tcp_ipv4.c
net/ipv6/route.c
net/netfilter/nf_conntrack_netlink.c

diff --cc MAINTAINERS
Simple merge
@@@ -167,11 -166,9 +167,11 @@@ static int netvsc_start_xmit(struct sk_
  
                dev_kfree_skb(skb);
                net->stats.tx_dropped++;
-               return NETDEV_TX_BUSY;
+               return NETDEV_TX_OK;
        }
  
 +      packet->vlan_tci = skb->vlan_tci;
 +
        packet->extension = (void *)(unsigned long)packet +
                                sizeof(struct hv_netvsc_packet) +
                                    (num_pages * sizeof(struct hv_page_buffer));
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge