diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 11:55:16 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 11:55:16 +0100 |
| commit | 8e7deaa4367607057fd7c1038d2f6df981367bd5 (patch) | |
| tree | 971e4ca767c3bad790ba13c0dade61181a7d0bb2 /net | |
| parent | 534714781c652a7113b6c90479a781a6b510279e (diff) | |
| parent | 75ef7cdda2daa35be9e070ac8e5258759ac03d06 (diff) | |
| download | lwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.tar.gz lwn-8e7deaa4367607057fd7c1038d2f6df981367bd5.zip | |
Merge branch 'linus' into rt/head
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ae4873fcae7e..6a867ce62c06 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2785,7 +2785,7 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, switch (ret) { case GRO_NORMAL: case GRO_HELD: - skb->protocol = eth_type_trans(skb, napi->dev); + skb->protocol = eth_type_trans(skb, skb->dev); if (ret == GRO_HELD) skb_gro_pull(skb, -ETH_HLEN); |