aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c5
1 files changed, 2 insertions, 3 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);
2602int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, 2602int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
2603 struct netdev_queue *txq) 2603 struct netdev_queue *txq)
2604{ 2604{
2605 const struct net_device_ops *ops = dev->netdev_ops;
2606 int rc = NETDEV_TX_OK; 2605 int rc = NETDEV_TX_OK;
2607 unsigned int skb_len; 2606 unsigned int skb_len;
2608 2607
@@ -2667,7 +2666,7 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
2667 2666
2668 skb_len = skb->len; 2667 skb_len = skb->len;
2669 trace_net_dev_start_xmit(skb, dev); 2668 trace_net_dev_start_xmit(skb, dev);
2670 rc = ops->ndo_start_xmit(skb, dev); 2669 rc = netdev_start_xmit(skb, dev);
2671 trace_net_dev_xmit(skb, rc, dev, skb_len); 2670 trace_net_dev_xmit(skb, rc, dev, skb_len);
2672 if (rc == NETDEV_TX_OK) 2671 if (rc == NETDEV_TX_OK)
2673 txq_trans_update(txq); 2672 txq_trans_update(txq);
@@ -2686,7 +2685,7 @@ gso:
2686 2685
2687 skb_len = nskb->len; 2686 skb_len = nskb->len;
2688 trace_net_dev_start_xmit(nskb, dev); 2687 trace_net_dev_start_xmit(nskb, dev);
2689 rc = ops->ndo_start_xmit(nskb, dev); 2688 rc = netdev_start_xmit(nskb, dev);
2690 trace_net_dev_xmit(nskb, rc, dev, skb_len); 2689 trace_net_dev_xmit(nskb, rc, dev, skb_len);
2691 if (unlikely(rc != NETDEV_TX_OK)) { 2690 if (unlikely(rc != NETDEV_TX_OK)) {
2692 if (rc & ~NETDEV_TX_MASK) 2691 if (rc & ~NETDEV_TX_MASK)