Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86eb4b22 authored by Robert Hancock's avatar Robert Hancock Committed by Greg Kroah-Hartman
Browse files

net: axienet: fix number of TX ring slots for available check 



commit aba57a823d2985a2cc8c74a2535f3a88e68d9424 upstream.

The check for the number of available TX ring slots was off by 1 since a
slot is required for the skb header as well as each fragment. This could
result in overwriting a TX ring slot that was still in use.

Fixes: 8a3b7a25 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver")
Signed-off-by: default avatarRobert Hancock <robert.hancock@calian.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b8ad8a7

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+2 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
	num_frag = skb_shinfo(skb)->nr_frags;

	cur_p = &lp->tx_bd_v[lp->tx_bd_tail];



	if (axienet_check_tx_bd_space(lp, num_frag)) {

	if (axienet_check_tx_bd_space(lp, num_frag + 1)) {

		if (netif_queue_stopped(ndev))

			return NETDEV_TX_BUSY;
@@ -692,7 +692,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		smp_mb();



		/* Space might have just been freed - check again */

		if (axienet_check_tx_bd_space(lp, num_frag))

		if (axienet_check_tx_bd_space(lp, num_frag + 1))

			return NETDEV_TX_BUSY;



		netif_wake_queue(ndev);