diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-27 09:53:29 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-27 09:53:29 -0400 |
| commit | 0bfaabbc21b28bacfca3121ca4bd1dd1c308622b (patch) | |
| tree | d436a03f86c16fc4a48b400de58e0ac6224b02a8 | |
| parent | 8dab1fd52777427896b8833d3387a56cd5768e11 (diff) | |
| download | longterm-queue-4.12-0bfaabbc21b28bacfca3121ca4bd1dd1c308622b.tar.gz | |
cavium: liquidio patch fixup
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/liquidio-fix-kernel-panic-in-VF-driver.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch index 322770d..f9b5612 100644 --- a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch +++ b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch @@ -1,4 +1,4 @@ -From 997ed4dff3930b17601c5b485d02af2c1242904f Mon Sep 17 00:00:00 2001 +From a066546335bf37682670a703489eb4ff2fe83f82 Mon Sep 17 00:00:00 2001 From: Felix Manlunas <felix.manlunas@cavium.com> Date: Thu, 26 Oct 2017 16:46:36 -0700 Subject: [PATCH] liquidio: fix kernel panic in VF driver @@ -56,19 +56,19 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c -index 34c77821fad9..d071d1cc77dd 100644 +index 34c77821fad9..d6f5796e8e66 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c -@@ -1766,6 +1766,9 @@ static int liquidio_open(struct net_device *netdev) +@@ -1800,6 +1800,9 @@ static int liquidio_stop(struct net_device *netdev) + struct lio *lio = GET_LIO(netdev); struct octeon_device *oct = lio->oct_dev; - struct napi_struct *napi, *n; + /* tell Octeon to stop forwarding packets to host */ + send_rx_ctrl_cmd(lio, 0); + - if (!oct->props[lio->ifidx].napi_enabled) { - list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) - napi_enable(napi); + netif_info(lio, ifdown, lio->netdev, "Stopping interface!\n"); + /* Inform that netif carrier is down */ + lio->intf_open = 0; @@ -1808,9 +1811,6 @@ static int liquidio_stop(struct net_device *netdev) netif_carrier_off(netdev); lio->link_changes++; |