lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	net/ipv4/ip_output.c
This commit is contained in:
David S. Miller
2010-06-23 18:26:27 -07:00
parent 7b2ff18ee7 38000a94a9
commit 8244132ea8
25 changed files with 116 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ucc_geth.c
View File

@ -3215,6 +3215,8 @@ static int ucc_geth_rx(struct ucc_geth_private *ugeth, u8 rxQ, int rx_work_limit
__func__, __LINE__, (u32) skb);
if (skb) {
skb->data = skb->head + NET_SKB_PAD;
skb->len = 0;
skb_reset_tail_pointer(skb);
__skb_queue_head(&ugeth->rx_recycle, skb);
}