diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2021-12-02 22:45:04 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2021-12-02 22:45:04 +0000 |
| commit | db0ac6ded61105caab4700aeac255328d4238dc4 (patch) | |
| tree | 1ecb794fd4e9d2076de2fdd040b4fe0335f2b89e /sys/net | |
| parent | 266f97b5e9a7958e365e78288616a459b40d924a (diff) | |
| download | src-db0ac6ded61105caab4700aeac255328d4238dc4.tar.gz src-db0ac6ded61105caab4700aeac255328d4238dc4.zip | |
Revert "wpa: Import wpa_supplicant/hostapd commit 14ab4a816"
This reverts commit 266f97b5e9a7958e365e78288616a459b40d924a, reversing
changes made to a10253cffea84c0c980a36ba6776b00ed96c3e3b.
A mismerge of a merge to catch up to main resulted in files being
committed which should not have been.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 3 | ||||
| -rw-r--r-- | sys/net/rss_config.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 85bf7e91fe1c..75e67c3dd8ba 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -36,6 +36,7 @@ #include "opt_bpf.h" #include "opt_inet6.h" #include "opt_inet.h" +#include "opt_ddb.h" #include <sys/param.h> #include <sys/capsicum.h> @@ -4668,7 +4669,7 @@ DB_SHOW_ALL_COMMAND(ifnets, db_show_all_ifnets) db_printf("vnet=%p\n", curvnet); #endif for (idx = 1; idx <= V_if_index; idx++) { - ifp = V_ifindex_table[idx].ife_ifnet; + ifp = V_ifindex_table[idx]; if (ifp == NULL) continue; db_printf( "%20s ifp=%p\n", ifp->if_xname, ifp); diff --git a/sys/net/rss_config.c b/sys/net/rss_config.c index 0b559307f1bb..ee15ed3da2bf 100644 --- a/sys/net/rss_config.c +++ b/sys/net/rss_config.c @@ -32,11 +32,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include "opt_pcbgroup.h" - -#ifndef PCBGROUP -#error "options RSS depends on options PCBGROUP" -#endif #include <sys/param.h> #include <sys/mbuf.h> |