net: Add ops->ndo_xmit_flush()

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 4 insertions, 8 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index b6a718ec11c1..26d296c2447c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2602,7 +2602,6 @@ EXPORT_SYMBOL(netif_skb_features);
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
                         struct netdev_queue *txq)
 {
-        const struct net_device_ops *ops = dev->netdev_ops;
         int rc = NETDEV_TX_OK;
         unsigned int skb_len;
 
@@ -2667,7 +2666,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
 
                 skb_len = skb->len;
                 trace_net_dev_start_xmit(skb, dev);
-                rc = ops->ndo_start_xmit(skb, dev);
+                rc = netdev_start_xmit(skb, dev);
                 trace_net_dev_xmit(skb, rc, dev, skb_len);
                 if (rc == NETDEV_TX_OK)
                         txq_trans_update(txq);
@@ -2686,7 +2685,7 @@ gso:
 
                 skb_len = nskb->len;
                 trace_net_dev_start_xmit(nskb, dev);
-                rc = ops->ndo_start_xmit(nskb, dev);
+                rc = netdev_start_xmit(nskb, dev);
                 trace_net_dev_xmit(nskb, rc, dev, skb_len);
                 if (unlikely(rc != NETDEV_TX_OK)) {
                         if (rc & ~NETDEV_TX_MASK)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 907fb5e36c02..a5ad06828d67 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -72,7 +72,6 @@ module_param(carrier_timeout, uint, 0644);
 static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
                               struct netdev_queue *txq)
 {
-        const struct net_device_ops *ops = dev->netdev_ops;
         int status = NETDEV_TX_OK;
         netdev_features_t features;
 
@@ -92,7 +91,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
                 skb->vlan_tci = 0;
         }
 
-        status = ops->ndo_start_xmit(skb, dev);
+        status = netdev_start_xmit(skb, dev);
         if (status == NETDEV_TX_OK)
                 txq_trans_update(txq);
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8b849ddfef2e..83e2b4b19eb7 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3285,8 +3285,6 @@ static void pktgen_wait_for_skb(struct pktgen_dev *pkt_dev)
 static void pktgen_xmit(struct pktgen_dev *pkt_dev)
 {
         struct net_device *odev = pkt_dev->odev;
-        netdev_tx_t (*xmit)(struct sk_buff *, struct net_device *)
-                = odev->netdev_ops->ndo_start_xmit;
         struct netdev_queue *txq;
         u16 queue_map;
         int ret;
@@ -3339,7 +3337,7 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 goto unlock;
         }
         atomic_inc(&(pkt_dev->skb->users));
-        ret = (*xmit)(pkt_dev->skb, odev);
+        ret = netdev_start_xmit(pkt_dev->skb, odev);
 
         switch (ret) {
         case NETDEV_TX_OK: