diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-26 15:53:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 15:53:06 -0400 |
| commit | c578e9ab4cd467bd7b9e1ea391b5376894c56d0d (patch) | |
| tree | 893afe6a3b448bfeb0dd36cae35a6ce844230852 /drivers/net/rionet.c | |
| parent | c971c0e580a6478c75339e45300e8ae3d167c0e9 (diff) | |
| parent | f0cdf76c103ffa34ca5ac87dcdef7edffc722cbf (diff) | |
Merge branch 'netdev_tx_locked-removal'
Florian Westphal says:
====================
net: core: remove TX_LOCKED support
Not that many users left, lets kill it.
TX_LOCKED was meant to be used by LLTX drivers when spin_trylock()
failed. Stack then re-queued if collisions happened on different
cpus or free'd the skb to prevent deadlocks.
Most of the driver removal patches fall into one of three categories:
1. remove the driver-private tx lock (and LLTX flag), or...
2. convert spin_trylock to plain spin_lock, or...
3. convert TX_LOCKED to free+TX_OK
Patches are grouped by these categories, last patch is the actual removal.
All driver changes were compile tested only with exception of atl1e.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/rionet.c')
| -rw-r--r-- | drivers/net/rionet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index 9cfe6aeac84e..a31f4610b493 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c @@ -179,11 +179,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) unsigned long flags; int add_num = 1; - local_irq_save(flags); - if (!spin_trylock(&rnet->tx_lock)) { - local_irq_restore(flags); - return NETDEV_TX_LOCKED; - } + spin_lock_irqsave(&rnet->tx_lock, flags); if (is_multicast_ether_addr(eth->h_dest)) add_num = nets[rnet->mport->id].nact; |