1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From a16c80c305b2e11fe3efd0905bbe7db8388bf545 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 1 Jan 2017 15:43:37 +0100
Subject: [PATCH 19/32] ivshmem-net: Switch to reset state on each net stop and
on driver removal
Improves the state signaling to the remote side after ifconfig down and
driver removal.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/net/ivshmem-net.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
index cff6aa0be71d..09484d652add 100644
--- a/drivers/net/ivshmem-net.c
+++ b/drivers/net/ivshmem-net.c
@@ -554,6 +554,8 @@ static void ivshm_net_do_stop(struct net_device *ndev)
{
struct ivshm_net *in = netdev_priv(ndev);
+ ivshm_net_set_state(in, IVSHM_NET_STATE_RESET);
+
if (!test_and_clear_bit(IVSHM_NET_FLAG_RUN, &in->flags))
return;
@@ -593,7 +595,6 @@ static void ivshm_net_state_change(struct work_struct *work)
} else {
netif_carrier_off(ndev);
ivshm_net_do_stop(ndev);
- ivshm_net_set_state(in, IVSHM_NET_STATE_RESET);
}
break;
}
@@ -899,6 +900,8 @@ static void ivshm_net_remove(struct pci_dev *pdev)
struct net_device *ndev = pci_get_drvdata(pdev);
struct ivshm_net *in = netdev_priv(ndev);
+ writel(IVSHM_NET_STATE_RESET, &in->ivshm_regs->lstate);
+
if (in->using_msix) {
free_irq(in->msix.vector, ndev);
pci_disable_msix(pdev);
--
2.11.0
|
