Page MenuHomeFreeBSD
Files F163279978

D53097.id164173.diff
No OneTemporary
Actions

D53097.id164173.diff
View Options

diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c
--- 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.h b/sys/dev/e1000/if_em.h
--- 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/if_em.c b/sys/dev/e1000/if_em.c
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -3404,12 +3404,8 @@
*/
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/igb_txrx.c b/sys/dev/e1000/igb_txrx.c
--- 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

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 4:54 PM (2 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35372830
Default Alt Text
D53097.id164173.diff (1 KB)

Event Timeline