| Message ID | 1454487652-1545-5-git-send-email-sassmann@kpanic.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
> From: Intel-wired-lan [intel-wired-lan-bounces@lists.osuosl.org] on behalf of Stefan Assmann [sassmann@kpanic.de] > Sent: Wednesday, February 03, 2016 12:20 AM > To: intel-wired-lan@lists.osuosl.org > Cc: netdev@vger.kernel.org; davem@davemloft.net; sassmann@kpanic.de > Subject: [Intel-wired-lan] [PATCH net-next V2 4/6] igb: 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: Stefan Assmann <sassmann@kpanic.de> > --- > drivers/net/ethernet/intel/igb/igb.h | 2 ++ > drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ++-- > drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++---- > 3 files changed, 8 insertions(+), 6 deletions(-) Checkpatch warns that externs should be avoided in .c files, but they pre-existed and are just being flagged due to the name changing, so... Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Aaron F <aaron.f.brown@intel.com> wrote: >> From: Intel-wired-lan [intel-wired-lan-bounces@lists.osuosl.org] on >> behalf of Stefan Assmann [sassmann@kpanic.de] >> Sent: Wednesday, February 03, 2016 12:20 AM >> To: intel-wired-lan@lists.osuosl.org >> Cc: netdev@vger.kernel.org; davem@davemloft.net; sassmann@kpanic.de >> Subject: [Intel-wired-lan] [PATCH net-next V2 4/6] igb: 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: Stefan Assmann <sassmann@kpanic.de> >> --- >> drivers/net/ethernet/intel/igb/igb.h | 2 ++ >> drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ++-- >> drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++---- >> 3 files changed, 8 insertions(+), 6 deletions(-) > > Checkpatch warns that externs should be avoided in .c files, but they > pre-existed and are just being flagged due to the name changing, so... > > Tested-by: Aaron Brown <aaron.f.brown@intel.com> Again, the prototypes in the .c should be deleted in favor of the ones that were added to the .h file. -- Mark Rustad, Networking Division, Intel Corporation
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index e3cb93b..5dac361 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h @@ -510,6 +510,8 @@ enum igb_boards { extern char igb_driver_name[]; extern char igb_driver_version[]; +int igb_open(struct net_device *netdev); +int igb_close(struct net_device *netdev); int igb_up(struct igb_adapter *); void igb_down(struct igb_adapter *); void igb_reinit_locked(struct igb_adapter *); diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 1d329f1..7982243 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2017,7 +2017,7 @@ static void igb_diag_test(struct net_device *netdev, if (if_running) /* indicate we're in test mode */ - dev_close(netdev); + igb_close(netdev); else igb_reset(adapter); @@ -2050,7 +2050,7 @@ static void igb_diag_test(struct net_device *netdev, clear_bit(__IGB_TESTING, &adapter->state); if (if_running) - dev_open(netdev); + igb_open(netdev); } else { dev_info(&adapter->pdev->dev, "online testing starting\n"); diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 31e5f39..7a2ccb5 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -122,8 +122,8 @@ static void igb_setup_mrqc(struct igb_adapter *); static int igb_probe(struct pci_dev *, const struct pci_device_id *); static void igb_remove(struct pci_dev *pdev); static int igb_sw_init(struct igb_adapter *); -static int igb_open(struct net_device *); -static int igb_close(struct net_device *); +int igb_open(struct net_device *); +int igb_close(struct net_device *); static void igb_configure(struct igb_adapter *); static void igb_configure_tx(struct igb_adapter *); static void igb_configure_rx(struct igb_adapter *); @@ -3132,7 +3132,7 @@ err_setup_tx: return err; } -static int igb_open(struct net_device *netdev) +int igb_open(struct net_device *netdev) { return __igb_open(netdev, false); } @@ -3169,7 +3169,7 @@ static int __igb_close(struct net_device *netdev, bool suspending) return 0; } -static int igb_close(struct net_device *netdev) +int igb_close(struct net_device *netdev) { return __igb_close(netdev, false); }
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: Stefan Assmann <sassmann@kpanic.de> --- drivers/net/ethernet/intel/igb/igb.h | 2 ++ drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ++-- drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-)