diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 11:33:37 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 11:33:37 +1100 |
commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
tree | abf9d83c704417cdd484243c12aeffee6b185aba /drivers/net/loopback.c | |
parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
download | linux-dfd0436ad0ce139467b124c646fa65ee2635e14a.tar.bz2 |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'drivers/net/loopback.c')
-rw-r--r-- | drivers/net/loopback.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 81f8f9e31db5..fcbf680c3e62 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -77,6 +77,11 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, skb_orphan(skb); + /* Before queueing this packet to netif_rx(), + * make sure dst is refcounted. + */ + skb_dst_force(skb); + skb->protocol = eth_type_trans(skb, dev); /* it's OK to use per_cpu_ptr() because BHs are off */ |