diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-31 13:13:24 -0800 |
| commit | 5403c8a29521a6eb02f9283dbbe0184527f8f42b (patch) | |
| tree | 4f1ca17feda4dfa88f53eceeaa39583ec840d27e /net/core/dev.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (diff) | |
| parent | bnx2x: Update bnx2x version to 1.62.00-5 (diff) | |
| download | linux-dev-5403c8a29521a6eb02f9283dbbe0184527f8f42b.tar.xz linux-dev-5403c8a29521a6eb02f9283dbbe0184527f8f42b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ddd5df2b61d4..9109e2648d4d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3564,6 +3564,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) __skb_pull(skb, skb_headlen(skb)); skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb)); skb->vlan_tci = 0; + skb->dev = napi->dev; napi->skb = skb; } |