datapath: Use kfree_skb() only on error paths.

[openvswitch] / datapath / vport-internal_dev.c

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 1c6897f4f1f0a0d3be2483287ae09dbf29199a33..a468ac83506212f9b98985bcb3843f3d07b066ef 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -22,6 +22,10 @@
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#define HAVE_NET_DEVICE_OPS
+#endif
+
 struct internal_dev {
        struct vport *vport;
        struct net_device_stats stats;
@@ -167,6 +171,7 @@ static void do_setup(struct net_device *netdev)
        netdev->change_mtu = internal_dev_change_mtu;
 #endif
 
+       netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
        netdev->destructor = internal_dev_destructor;
        SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
        netdev->tx_queue_len = 0;
@@ -251,10 +256,7 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
        skb->protocol = eth_type_trans(skb, netdev);
        forward_ip_summed(skb, false);
 
-       if (in_interrupt())
-               netif_rx(skb);
-       else
-               netif_rx_ni(skb);
+       netif_rx(skb);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
        netdev->last_rx = jiffies;