diff options
| author | Florian Westphal <fw@strlen.de> | 2016-04-24 22:38:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 22:53:05 +0300 |
| commit | a6086a893718db07ef9e7af5624ec27cb376ef0a (patch) | |
| tree | d79f3678a33c11fa2613cd1f3c4fc393e37222f4 /drivers/net/rionet.c | |
| parent | 926f27300100f4233c7665649f68fcf615f58d68 (diff) | |
| download | linux-a6086a893718db07ef9e7af5624ec27cb376ef0a.tar.xz | |
drivers: net: remove NETDEV_TX_LOCKED
replace the trylock by a full spin_lock and remove TX_LOCKED return value.
Followup patch will remove TX_LOCKED from the kernel.
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
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; |