diff options
| author | Todd Fujinaka <todd.fujinaka@intel.com> | 2015-06-19 11:17:56 -0700 |
|---|---|---|
| committer | Todd Fujinaka <todd.fujinaka@intel.com> | 2015-06-19 11:17:56 -0700 |
| commit | 2fdb56a391e9e09ff22837e56d594507fbaf9250 (patch) | |
| tree | 00b063737e956d88332a3017f5f682f3b6bb5492 /kmod/igb/igb_vmdq.c | |
| parent | 365cf04f73715780e123312ddadd83d202aa1bdd (diff) | |
| download | Open-AVB-2fdb56a391e9e09ff22837e56d594507fbaf9250.tar.gz | |
igb-avb: sync to igb-5.3.2
Diffstat (limited to 'kmod/igb/igb_vmdq.c')
| -rw-r--r-- | kmod/igb/igb_vmdq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmod/igb/igb_vmdq.c b/kmod/igb/igb_vmdq.c index 87b5d6f9..fdc0bcbb 100644 --- a/kmod/igb/igb_vmdq.c +++ b/kmod/igb/igb_vmdq.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) Gigabit Ethernet Linux driver - Copyright(c) 2007-2014 Intel Corporation. + Copyright(c) 2007-2015 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -333,11 +333,11 @@ static int igb_vmdq_get_settings(struct net_device *netdev, if ((status & E1000_STATUS_SPEED_1000) || hw->phy.media_type != e1000_media_type_copper) - ecmd->speed = SPEED_1000; + ethtool_cmd_speed_set(ecmd, SPEED_1000); else if (status & E1000_STATUS_SPEED_100) - ecmd->speed = SPEED_100; + ethtool_cmd_speed_set(ecmd, SPEED_100); else - ecmd->speed = SPEED_10; + ethtool_cmd_speed_set(ecmd, SPEED_10); if ((status & E1000_STATUS_FD) || hw->phy.media_type != e1000_media_type_copper) @@ -345,7 +345,7 @@ static int igb_vmdq_get_settings(struct net_device *netdev, else ecmd->duplex = DUPLEX_HALF; } else { - ecmd->speed = -1; + ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN); ecmd->duplex = -1; } |