Commit 08ca3874 authored by Stefan Assmann's avatar Stefan Assmann Committed by Jeff Kirsher

i40e: call ndo_stop() instead of dev_close() when running offline selftest

Calling dev_close() causes IFF_UP to be cleared which will remove the
interfaces routes and some addresses. That's probably not what the user
intended when running the offline selftest. Besides this does not happen
if the interface is brought down before the test, so the current
behaviour is inconsistent.
Instead call the net_device_ops ndo_stop function directly and avoid
touching IFF_UP at all.
Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 15f41e2b
...@@ -811,6 +811,7 @@ int i40e_vlan_rx_kill_vid(struct net_device *netdev, ...@@ -811,6 +811,7 @@ int i40e_vlan_rx_kill_vid(struct net_device *netdev,
__always_unused __be16 proto, u16 vid); __always_unused __be16 proto, u16 vid);
#endif #endif
int i40e_open(struct net_device *netdev); int i40e_open(struct net_device *netdev);
int i40e_close(struct net_device *netdev);
int i40e_vsi_open(struct i40e_vsi *vsi); int i40e_vsi_open(struct i40e_vsi *vsi);
void i40e_vlan_stripping_disable(struct i40e_vsi *vsi); void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);
int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid); int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);
...@@ -823,7 +824,6 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi); ...@@ -823,7 +824,6 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);
struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr, struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,
bool is_vf, bool is_netdev); bool is_vf, bool is_netdev);
#ifdef I40E_FCOE #ifdef I40E_FCOE
int i40e_close(struct net_device *netdev);
int __i40e_setup_tc(struct net_device *netdev, u32 handle, __be16 proto, int __i40e_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,
struct tc_to_netdev *tc); struct tc_to_netdev *tc);
void i40e_netpoll(struct net_device *netdev); void i40e_netpoll(struct net_device *netdev);
......
...@@ -1714,7 +1714,7 @@ static void i40e_diag_test(struct net_device *netdev, ...@@ -1714,7 +1714,7 @@ static void i40e_diag_test(struct net_device *netdev,
/* If the device is online then take it offline */ /* If the device is online then take it offline */
if (if_running) if (if_running)
/* indicate we're in test mode */ /* indicate we're in test mode */
dev_close(netdev); i40e_close(netdev);
else else
/* This reset does not affect link - if it is /* This reset does not affect link - if it is
* changed to a type of reset that does affect * changed to a type of reset that does affect
...@@ -1743,7 +1743,7 @@ static void i40e_diag_test(struct net_device *netdev, ...@@ -1743,7 +1743,7 @@ static void i40e_diag_test(struct net_device *netdev,
i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED)); i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));
if (if_running) if (if_running)
dev_open(netdev); i40e_open(netdev);
} else { } else {
/* Online tests */ /* Online tests */
netif_info(pf, drv, netdev, "online testing starting\n"); netif_info(pf, drv, netdev, "online testing starting\n");
......
...@@ -5509,11 +5509,7 @@ static void i40e_fdir_filter_exit(struct i40e_pf *pf) ...@@ -5509,11 +5509,7 @@ static void i40e_fdir_filter_exit(struct i40e_pf *pf)
* *
* Returns 0, this is not allowed to fail * Returns 0, this is not allowed to fail
**/ **/
#ifdef I40E_FCOE
int i40e_close(struct net_device *netdev) int i40e_close(struct net_device *netdev)
#else
static int i40e_close(struct net_device *netdev)
#endif
{ {
struct i40e_netdev_priv *np = netdev_priv(netdev); struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_vsi *vsi = np->vsi; struct i40e_vsi *vsi = np->vsi;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment