diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
| commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
| tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /drivers/net/ifb.c | |
| parent | 6ccfe64c770139675a080ee5029ded7d89d9ea0d (diff) | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| download | blackbird-op-linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.gz blackbird-op-linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip | |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'drivers/net/ifb.c')
| -rw-r--r-- | drivers/net/ifb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 34f846b4bd05..94570aace241 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -105,7 +105,7 @@ static void ri_tasklet(unsigned long dev) if (from & AT_EGRESS) { dev_queue_xmit(skb); } else if (from & AT_INGRESS) { - skb_pull(skb, skb->dev->hard_header_len); + skb_pull(skb, skb->mac_len); netif_receive_skb(skb); } else BUG(); |
