aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2014-11-18 00:20:41 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-19 14:43:47 -0500
commitbaeababb5b85d5c4e6c917efe2a1504179438d3b (patch)
treed6d49a06b241812b5f1955bc4ef417d6aba3bb8a /drivers/net/tun.c
parente3e3217029a35c579bf100998b43976d0b1cb8d7 (diff)
tun: return NET_XMIT_DROP for dropped packets
After commit 5d097109257c03a71845729f8db6b5770c4bbedc ("tun: only queue packets on device"), NETDEV_TX_OK was returned for dropped packets. This will confuse pktgen since dropped packets were counted as sent ones. Fixing this by returning NET_XMIT_DROP to let pktgen count it as error packet. Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index e3fa65a4d96c..ac53a7316ecd 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -819,7 +819,7 @@ drop:
819 skb_tx_error(skb); 819 skb_tx_error(skb);
820 kfree_skb(skb); 820 kfree_skb(skb);
821 rcu_read_unlock(); 821 rcu_read_unlock();
822 return NETDEV_TX_OK; 822 return NET_XMIT_DROP;
823} 823}
824 824
825static void tun_net_mclist(struct net_device *dev) 825static void tun_net_mclist(struct net_device *dev)