diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-04-04 09:51:08 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-04-04 09:51:08 (GMT) |
| commit | a99e31512aa435e8391ba5f5e64abeac9c5f2f32 (patch) | |
| tree | 56bb9d9ccfe76520b672249757e25f686275b204 /drivers/net/ethernet/intel/ixgbevf/ethtool.c | |
| parent | 86c8dd7f4da3fb3f92fc5ab5144c971639d39745 (diff) | |
| parent | f03b24a851d32ca85dacab01785b24a7ee717d37 (diff) | |
| download | linux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.tar.xz | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/hda/hdac_i915.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index c48aef6..d7aa4b2 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -680,7 +680,7 @@ static void ixgbevf_diag_test(struct net_device *netdev, if (if_running) /* indicate we're in test mode */ - dev_close(netdev); + ixgbevf_close(netdev); else ixgbevf_reset(adapter); @@ -692,7 +692,7 @@ static void ixgbevf_diag_test(struct net_device *netdev, clear_bit(__IXGBEVF_TESTING, &adapter->state); if (if_running) - dev_open(netdev); + ixgbevf_open(netdev); } else { hw_dbg(&adapter->hw, "online testing starting\n"); /* Online tests */ |