leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: net: aurora: use netdev_xmit_more helper

Browse Source 
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>
This commit is contained in:
Florian Westphal 2019-04-01 16:42:17 +02:00 committed by David S. Miller
parent f79c957a0b
commit 4f296edeb9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/aurora/nb8800.c
View File

@ -404,6 +404,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned int dma_len; unsigned int dma_len;
unsigned int align; unsigned int align;
unsigned int next; unsigned int next;
bool xmit_more;
if (atomic_read(&priv->tx_free) <= NB8800_DESC_LOW) { if (atomic_read(&priv->tx_free) <= NB8800_DESC_LOW) {
netif_stop_queue(dev); netif_stop_queue(dev);
@ -423,9 +424,10 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
xmit_more = netdev_xmit_more();
if (atomic_dec_return(&priv->tx_free) <= NB8800_DESC_LOW) { if (atomic_dec_return(&priv->tx_free) <= NB8800_DESC_LOW) {
netif_stop_queue(dev); netif_stop_queue(dev);
skb->xmit_more = 0; xmit_more = false;
} }
next = priv->tx_next; 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->n_addr = priv->tx_bufs[next].dma_desc;
desc->config = DESC_BTS(2) | DESC_DS | DESC_EOF | dma_len; desc->config = DESC_BTS(2) | DESC_DS | DESC_EOF | dma_len;
if (!skb->xmit_more) if (!xmit_more)
desc->config |= DESC_EOC; desc->config |= DESC_EOC;
txb->skb = skb; txb->skb = skb;
@ -468,7 +470,7 @@ static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)
priv->tx_next = next; priv->tx_next = next;
if (!skb->xmit_more) { if (!xmit_more) {
smp_wmb(); smp_wmb();
priv->tx_chain->ready = true; priv->tx_chain->ready = true;
priv->tx_chain = NULL; priv->tx_chain = NULL;

2
include/linux/skbuff.h
View File

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