The branch main has been updated by kbowling:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ddfec1fb6814088abc5805f45c4a18c5731d51b9
commit ddfec1fb6814088abc5805f45c4a18c5731d51b9
Author: Kevin Bowling <kbowl...@freebsd.org>
AuthorDate: 2024-09-21 06:27:54 +0000
Commit: Kevin Bowling <kbowl...@freebsd.org>
CommitDate: 2024-09-21 06:27:54 +0000
e1000: Update igb driver version to 2.5.28-fbsd
Bump to the current out of tree driver version since we only have some
gratuitous changes.
MFC after: 1 week
---
sys/dev/e1000/e1000_base.c | 3 ++-
sys/dev/e1000/e1000_i210.c | 14 +++++++-------
sys/dev/e1000/e1000_phy.c | 2 +-
sys/dev/e1000/if_em.c | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/sys/dev/e1000/e1000_base.c b/sys/dev/e1000/e1000_base.c
index d83dc48c4d4d..ae44a0b91aac 100644
--- a/sys/dev/e1000/e1000_base.c
+++ b/sys/dev/e1000/e1000_base.c
@@ -162,7 +162,8 @@ void e1000_rx_fifo_flush_base(struct e1000_hw *hw)
rfctl |= E1000_RFCTL_IPV6_EX_DIS;
E1000_WRITE_REG(hw, E1000_RFCTL, rfctl);
- if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN))
+ if (hw->mac.type != e1000_82575 ||
+ !(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN))
return;
/* Disable all Rx queues */
diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index c7ca56914dba..4005034d7d31 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -362,7 +362,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
E1000_INVM_RECORD_SIZE_IN_BYTES);
u32 buffer[E1000_INVM_SIZE];
s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND;
- u16 version = 0;
+ u16 nvm_version = 0;
DEBUGFUNC("e1000_read_invm_version");
@@ -379,14 +379,14 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
/* Check if we have first version location used */
if ((i == 1) && ((*record & E1000_INVM_VER_FIELD_ONE) == 0)) {
- version = 0;
+ nvm_version = 0;
status = E1000_SUCCESS;
break;
}
/* Check if we have second version location used */
else if ((i == 1) &&
((*record & E1000_INVM_VER_FIELD_TWO) == 0)) {
- version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
+ nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS;
break;
}
@@ -397,7 +397,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
else if ((((*record & E1000_INVM_VER_FIELD_ONE) == 0) &&
((*record & 0x3) == 0)) || (((*record & 0x3) != 0) &&
(i != 1))) {
- version = (*next_record & E1000_INVM_VER_FIELD_TWO)
+ nvm_version = (*next_record & E1000_INVM_VER_FIELD_TWO)
>> 13;
status = E1000_SUCCESS;
break;
@@ -408,16 +408,16 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
*/
else if (((*record & E1000_INVM_VER_FIELD_TWO) == 0) &&
((*record & 0x3) == 0)) {
- version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
+ nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS;
break;
}
}
if (status == E1000_SUCCESS) {
- invm_ver->invm_major = (version & E1000_INVM_MAJOR_MASK)
+ invm_ver->invm_major = (nvm_version & E1000_INVM_MAJOR_MASK)
>> E1000_INVM_MAJOR_SHIFT;
- invm_ver->invm_minor = version & E1000_INVM_MINOR_MASK;
+ invm_ver->invm_minor = nvm_version & E1000_INVM_MINOR_MASK;
}
/* Read Image Type */
for (i = 1; i < invm_blocks; i++) {
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c
index 0aaf32125bbe..634f48171c3e 100644
--- a/sys/dev/e1000/e1000_phy.c
+++ b/sys/dev/e1000/e1000_phy.c
@@ -1037,7 +1037,7 @@ static s32 e1000_set_master_slave_mode(struct e1000_hw
*hw)
break;
case e1000_ms_auto:
phy_data &= ~CR_1000T_MS_ENABLE;
- /* FALLTHROUGH */
+ break;
default:
break;
}
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 690d6dfa3218..3d815348f5ec 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -37,7 +37,7 @@
* Driver version:
*********************************************************************/
static const char em_driver_version[] = "7.7.8-fbsd";
-static const char igb_driver_version[] = "2.5.19-fbsd";
+static const char igb_driver_version[] = "2.5.28-fbsd";
/*********************************************************************
* PCI Device ID Table
