redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
(cherry picked from commit d0f632b2830146d9892a2b1ab93f866f072412bb)
5.4-rM2-2.2.x-imx-squashed
Jan Kiszka 2017-01-01 15:43:37 +01:00 committed by Dong Aisheng
parent 6a8b7dac6c
commit 2219bf0ef9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ivshmem-net.c
View File

@ -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);