| From cb27fbc2dc6f12828122a6336ed4dadbf6d7001d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 24 Aug 2021 19:56:07 +0100 |
| Subject: lan78xx: Remove unused pause frame queue |
| |
| From: John Efstathiades <john.efstathiades@pebblebay.com> |
| |
| [ Upstream commit 40b8452fa8b4567ab7d862c7d4c3d02f635f17fd ] |
| |
| Remove the pause frame queue from the driver. It is initialised |
| but not actually used. |
| |
| Signed-off-by: John Efstathiades <john.efstathiades@pebblebay.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Stable-dep-of: f1e2f0ce704e ("net: usb: lan78xx: scan all MDIO addresses on LAN7801") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/usb/lan78xx.c | 9 --------- |
| 1 file changed, 9 deletions(-) |
| |
| diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c |
| index fd5fa64cbe932..41d55852bbf33 100644 |
| --- a/drivers/net/usb/lan78xx.c |
| +++ b/drivers/net/usb/lan78xx.c |
| @@ -379,7 +379,6 @@ struct lan78xx_net { |
| struct sk_buff_head rxq; |
| struct sk_buff_head txq; |
| struct sk_buff_head done; |
| - struct sk_buff_head rxq_pause; |
| struct sk_buff_head txq_pend; |
| |
| struct tasklet_struct bh; |
| @@ -2990,8 +2989,6 @@ static int lan78xx_stop(struct net_device *net) |
| |
| usb_kill_urb(dev->urb_intr); |
| |
| - skb_queue_purge(&dev->rxq_pause); |
| - |
| /* deferred work (task, timer, softirq) must also stop. |
| * can't flush_scheduled_work() until we drop rtnl (later), |
| * else workers could deadlock; so make workers a NOP. |
| @@ -3291,11 +3288,6 @@ static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb) |
| { |
| int status; |
| |
| - if (test_bit(EVENT_RX_PAUSED, &dev->flags)) { |
| - skb_queue_tail(&dev->rxq_pause, skb); |
| - return; |
| - } |
| - |
| dev->net->stats.rx_packets++; |
| dev->net->stats.rx_bytes += skb->len; |
| |
| @@ -3955,7 +3947,6 @@ static int lan78xx_probe(struct usb_interface *intf, |
| skb_queue_head_init(&dev->rxq); |
| skb_queue_head_init(&dev->txq); |
| skb_queue_head_init(&dev->done); |
| - skb_queue_head_init(&dev->rxq_pause); |
| skb_queue_head_init(&dev->txq_pend); |
| mutex_init(&dev->phy_mutex); |
| mutex_init(&dev->dev_mutex); |
| -- |
| 2.51.0 |
| |