Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46eafa59 authored by Stefan Assmann's avatar Stefan Assmann Committed by Jeff Kirsher
Browse files

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: default avatarStefan Assmann <sassmann@kpanic.de>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 030f9f52

drivers/net/ethernet/intel/igb/igb.h

+2 −0
Original line number Diff line number Diff line
@@ -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 *);

drivers/net/ethernet/intel/igb/igb_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/intel/igb/igb_main.c

+4 −4
Original line number Diff line number Diff line
@@ -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 *);
@@ -3172,7 +3172,7 @@ static int __igb_open(struct net_device *netdev, bool resuming) 
	return err;

}



static int igb_open(struct net_device *netdev)

int igb_open(struct net_device *netdev)

{

	return __igb_open(netdev, false);

}
@@ -3209,7 +3209,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);

}