diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-25 11:49:34 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-25 11:53:24 -0600 |
| commit | bf84078177d30933ed730b4ff0d86b51a5de5d36 (patch) | |
| tree | 032225362683b24abb60a57d817e9c6c2d60b8c0 /sys/dev/ixgbe/ixgbe_common.c | |
| parent | 70e9380803fa0356966c7a9425df6eca0c5459f1 (diff) | |
| download | FreeBSD-src-bf84078177d30933ed730b4ff0d86b51a5de5d36.zip FreeBSD-src-bf84078177d30933ed730b4ff0d86b51a5de5d36.tar.gz | |
Import of Intel ix-3.1.14 driver.
This is intended to fix the loss of link uppon applying certain settings to the interface.
Ticket #5913
Diffstat (limited to 'sys/dev/ixgbe/ixgbe_common.c')
| -rw-r--r-- | sys/dev/ixgbe/ixgbe_common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index feb74f6..04b8ea6 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -199,12 +199,9 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) break; } - if (!supported) { - ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED, + ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED, "Device %x does not support flow control autoneg", hw->device_id); - } - return supported; } @@ -2250,7 +2247,7 @@ s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw) * ixgbe_validate_mac_addr - Validate MAC address * @mac_addr: pointer to MAC address. * - * Tests a MAC address to ensure it is a valid Individual Address + * Tests a MAC address to ensure it is a valid Individual Address. **/ s32 ixgbe_validate_mac_addr(u8 *mac_addr) { @@ -2260,16 +2257,13 @@ s32 ixgbe_validate_mac_addr(u8 *mac_addr) /* Make sure it is not a multicast address */ if (IXGBE_IS_MULTICAST(mac_addr)) { - DEBUGOUT("MAC address is multicast\n"); status = IXGBE_ERR_INVALID_MAC_ADDR; /* Not a broadcast address */ } else if (IXGBE_IS_BROADCAST(mac_addr)) { - DEBUGOUT("MAC address is broadcast\n"); status = IXGBE_ERR_INVALID_MAC_ADDR; /* Reject the zero address */ } else if (mac_addr[0] == 0 && mac_addr[1] == 0 && mac_addr[2] == 0 && mac_addr[3] == 0 && mac_addr[4] == 0 && mac_addr[5] == 0) { - DEBUGOUT("MAC address is all zeros\n"); status = IXGBE_ERR_INVALID_MAC_ADDR; } return status; |
