The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3
commit e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3 Author: Andrew Gallatin <[email protected]> AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin <[email protected]> CommitDate: 2025-11-22 14:29:33 +0000 e1000: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53097 Reviewed by: kbowling Sponsored by: Netflix --- sys/dev/e1000/em_txrx.c | 2 -- sys/dev/e1000/if_em.c | 4 ---- sys/dev/e1000/if_em.h | 2 -- sys/dev/e1000/igb_txrx.c | 2 -- 4 files changed, 10 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index ced8d0f41d14..647255417b3e 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -29,10 +29,8 @@ #include "if_em.h" -#ifdef RSS #include <net/rss_config.h> #include <netinet/in_rss.h> -#endif #ifdef VERBOSE_DEBUG #define DPRINTF device_printf diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 02f4c431badd..bc841ba87ceb 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3415,12 +3415,8 @@ igb_initialize_rss_mapping(struct e1000_softc *sc) */ mrqc = E1000_MRQC_ENABLE_RSS_MQ; -#ifdef RSS /* XXX ew typecasting */ rss_getkey((uint8_t *) &rss_key); -#else - arc4rand(&rss_key, sizeof(rss_key), 0); -#endif for (i = 0; i < 10; i++) E1000_WRITE_REG_ARRAY(hw, E1000_RSSRK(0), i, rss_key[i]); diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 582e8d9c6327..4c80c7696952 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -72,10 +72,8 @@ #include <net/if_dl.h> #include <net/if_media.h> #include <net/iflib.h> -#ifdef RSS #include <net/rss_config.h> #include <netinet/in_rss.h> -#endif #include <net/if_types.h> #include <net/if_vlan_var.h> diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 568d84807173..46fe5c741055 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -28,10 +28,8 @@ #include "if_em.h" -#ifdef RSS #include <net/rss_config.h> #include <netinet/in_rss.h> -#endif #ifdef VERBOSE_DEBUG #define DPRINTF device_printf
