diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 17:34:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 17:34:14 +0100 |
| commit | c45bb8cb72136bf23d18926113bff04c8cc90813 (patch) | |
| tree | ae49a32f9c2536383c50d426c2eba1c7da1f22cf /drivers/net/tun.c | |
| parent | staging: comedi: ni_labpc: fix common detach (diff) | |
| parent | Linux 3.9-rc3 (diff) | |
| download | linux-c45bb8cb72136bf23d18926113bff04c8cc90813.tar.xz linux-c45bb8cb72136bf23d18926113bff04c8cc90813.zip | |
Merge 3.9-rc3 into staging-next
This resolves the merge error due to removing the ccg staging driver,
and picks up the other staging driver fixes that went into 3.9-rc3.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 2c6a22e278ea..b7c457adc0dc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -747,6 +747,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) goto drop; skb_orphan(skb); + nf_reset(skb); + /* Enqueue packet */ skb_queue_tail(&tfile->socket.sk->sk_receive_queue, skb); |