drivers: net: aurora: use netdev_xmit_more helper

This is the last driver using always-0 skb->xmit_more.
Switch it to netdev_xmit_more and remove the now unused xmit_more flag
from sk_buff.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 6f56276015a47d1069dd2dbcfd6335d7e74dcbb6..f62deeb6e9418859d52c7b379718942f9d92752d 100644 (file)
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -404,6 +404,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
        unsigned int dma_len;
        unsigned int align;
        unsigned int next;
+       bool xmit_more;
 
        if (atomic_read(&priv->tx_free) <= NB8800_DESC_LOW) {
                netif_stop_queue(dev);
@@ -423,9 +424,10 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
                return NETDEV_TX_OK;
        }
 
+       xmit_more = netdev_xmit_more();
        if (atomic_dec_return(&priv->tx_free) <= NB8800_DESC_LOW) {
                netif_stop_queue(dev);
-               skb->xmit_more = 0;
+               xmit_more = false;
        }
 
        next = priv->tx_next;
@@ -450,7 +452,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
        desc->n_addr = priv->tx_bufs[next].dma_desc;
        desc->config = DESC_BTS(2) | DESC_DS | DESC_EOF | dma_len;
 
-       if (!skb->xmit_more)
+       if (!xmit_more)
                desc->config |= DESC_EOC;
 
        txb->skb = skb;
@@ -468,7 +470,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
 
        priv->tx_next = next;
 
-       if (!skb->xmit_more) {
+       if (!xmit_more) {
                smp_wmb();
                priv->tx_chain->ready = true;
                priv->tx_chain = NULL;

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9027a8c4219f9a3b0de149ff2974db50471c328a..69b5538adcea2557b505b8e6d2c6c8678892a25e 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -657,7 +657,6 @@ typedef unsigned char *sk_buff_data_t;
  *     @tc_index: Traffic control index
  *     @hash: the packet hash
  *     @queue_mapping: Queue mapping for multiqueue devices
- *     @xmit_more: More SKBs are pending for this queue
  *     @pfmemalloc: skbuff was allocated from PFMEMALLOC reserves
  *     @active_extensions: active extensions (skb_ext_id types)
  *     @ndisc_nodetype: router type (from link layer)
@@ -764,7 +763,6 @@ struct sk_buff {
                                fclone:2,
                                peeked:1,
                                head_frag:1,
-                               xmit_more:1,
                                pfmemalloc:1;
 #ifdef CONFIG_SKB_EXTENSIONS
        __u8                    active_extensions;