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

Commit 4f809cea authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by David S. Miller
Browse files

net: sh_eth: Fix receive packet "exceeded" condition in sh_eth_rx() 



This patch fixes the packet "exceeded" condition in sh_eth_rx() when
RACT in an RX descriptor is not set and the "quota" is 0.
Otherwise, kernel panic happens because the "&n->poll_list" is deleted
twice in sh_eth_poll() which calls napi_complete() and net_rx_action().

Signed-off-by: default avatarKouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61f83d0d

drivers/net/ethernet/renesas/sh_eth.c

+3 −5
Original line number Diff line number Diff line
@@ -1399,7 +1399,6 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
	int entry = mdp->cur_rx % mdp->num_rx_ring;

	int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx;

	struct sk_buff *skb;

	int exceeded = 0;

	u16 pkt_len = 0;

	u32 desc_status;
@@ -1411,10 +1410,9 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
		if (--boguscnt < 0)

			break;



		if (*quota <= 0) {

			exceeded = 1;

		if (*quota <= 0)

			break;

		}



		(*quota)--;



		if (!(desc_status & RDFEND))
@@ -1508,7 +1506,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
		sh_eth_write(ndev, EDRRR_R, EDRRR);

	}



	return exceeded;

	return *quota <= 0;

}



static void sh_eth_rcv_snd_disable(struct net_device *ndev)