diff options
author | David S. Miller <davem@davemloft.net> | 2013-03-12 05:52:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-12 05:52:22 -0400 |
commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
tree | 3558f68717c70a67e18c3274bb17709a353d036f /drivers/net/tun.c | |
parent | 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (diff) | |
parent | 3da889b616164bde76a37350cf28e0d17a94e979 (diff) | |
download | op-kernel-dev-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.zip op-kernel-dev-e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 2c6a22e..b7c457a 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); |