projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81a430a
c16fa4f
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Mon, 19 Mar 2012 03:29:41 +0000
(23:29 -0400)
committer
David S. Miller
<davem@davemloft.net>
Mon, 19 Mar 2012 03:29:41 +0000
(23:29 -0400)
17 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/hyperv/netvsc_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/tun.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/asix.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/usbnet.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlegacy/3945-mac.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlegacy/3945.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2x00dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_ipv4.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/nf_conntrack_netlink.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Simple merge
diff --cc
drivers/net/hyperv/netvsc_drv.c
index
0f8e834
,
610860f
..
2517d20
---
1
/
drivers/net/hyperv/netvsc_drv.c
---
2
/
drivers/net/hyperv/netvsc_drv.c
+++ b/
drivers/net/hyperv/netvsc_drv.c
@@@
-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));
diff --cc
drivers/net/tun.c
Simple merge
diff --cc
drivers/net/usb/asix.c
Simple merge
diff --cc
drivers/net/usb/usbnet.c
Simple merge
diff --cc
drivers/net/wireless/iwlegacy/3945-mac.c
Simple merge
diff --cc
drivers/net/wireless/iwlegacy/3945.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge
diff --cc
net/ipv4/tcp_ipv4.c
Simple merge
diff --cc
net/ipv6/route.c
Simple merge
diff --cc
net/netfilter/nf_conntrack_netlink.c
Simple merge