summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2015-09-18 01:21:54 +0200
committerDavid S. Miller <davem@davemloft.net>2015-09-21 07:23:40 +0200
commit7a8a8e75d505147358b225173e890ada43a267e2 (patch)
tree9923b6608257a64e70ddb174fa65219af7709e8f /drivers
parent8139cp: Use dev_kfree_skb_any() instead of dev_kfree_skb() in cp_clean_rings() (diff)
downloadlinux-7a8a8e75d505147358b225173e890ada43a267e2.tar.xz
linux-7a8a8e75d505147358b225173e890ada43a267e2.zip
8139cp: Call __cp_set_rx_mode() from cp_tx_timeout()
Unless we reset the RX config, on real hardware I don't seem to receive any packets after a TX timeout. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 52a533445f30..ba3dab721806 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -1261,6 +1261,7 @@ static void cp_tx_timeout(struct net_device *dev)
cp_clean_rings(cp);
rc = cp_init_rings(cp);
cp_start_hw(cp);
+ __cp_set_rx_mode(dev);
cp_enable_irq(cp);
netif_wake_queue(dev);