aboutsummaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorJustin Hibbits <jhibbits@FreeBSD.org>2023-01-23 15:05:29 +0000
committerJustin Hibbits <jhibbits@FreeBSD.org>2023-01-31 20:02:16 +0000
commit3d0d5b21c9b2cfd7e48209340a090f63ca4bce03 (patch)
treea5debcaa7044f86ca30eb3307bf4b31c915d0704 /sys/net80211
parent30af2c131bb05528f9b14518a7ed3e98c590b55e (diff)
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211.c1
-rw-r--r--sys/net80211/ieee80211_adhoc.c1
-rw-r--r--sys/net80211/ieee80211_ddb.c6
-rw-r--r--sys/net80211/ieee80211_freebsd.c1
-rw-r--r--sys/net80211/ieee80211_hostap.c1
-rw-r--r--sys/net80211/ieee80211_input.c1
-rw-r--r--sys/net80211/ieee80211_ioctl.c1
-rw-r--r--sys/net80211/ieee80211_mesh.c1
-rw-r--r--sys/net80211/ieee80211_output.c1
-rw-r--r--sys/net80211/ieee80211_proto.c1
-rw-r--r--sys/net80211/ieee80211_scan.c1
-rw-r--r--sys/net80211/ieee80211_scan_sw.c1
-rw-r--r--sys/net80211/ieee80211_sta.c1
-rw-r--r--sys/net80211/ieee80211_wds.c1
14 files changed, 16 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 1034088c6fb6..fbf3e1ca01c8 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/if_types.h>
#include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index f591015ab3e0..4789bdd65aa1 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_llc.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net/bpf.h>
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index af4f8ea74799..b0e037d492fd 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -364,7 +364,7 @@ _db_show_vap(const struct ieee80211vap *vap, int showmesh, int showprocs)
db_printf("(%p)", vap->iv_mesh);
#endif
db_printf(" state %s", ieee80211_state_name[vap->iv_state]);
- db_printf(" ifp %p(%s)", vap->iv_ifp, vap->iv_ifp->if_xname);
+ db_printf(" ifp %p(%s)", vap->iv_ifp, if_name(vap->iv_ifp));
db_printf("\n");
db_printf("\tic %p", vap->iv_ic);
@@ -540,7 +540,7 @@ _db_show_com(const struct ieee80211com *ic, int showvaps, int showsta,
db_printf("COM: %p:", ic);
TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
- db_printf(" %s(%p)", vap->iv_ifp->if_xname, vap);
+ db_printf(" %s(%p)", if_name(vap->iv_ifp), vap);
db_printf("\n");
db_printf("\tsoftc %p", ic->ic_softc);
db_printf("\tname %s", ic->ic_name);
@@ -706,7 +706,7 @@ _db_show_all_vaps(void *arg, struct ieee80211com *ic)
const struct ieee80211vap *vap;
db_printf("%s: com %p vaps:", ic->ic_name, ic);
TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
- db_printf(" %s(%p)", vap->iv_ifp->if_xname, vap);
+ db_printf(" %s(%p)", if_name(vap->iv_ifp), vap);
db_printf("\n");
} else
_db_show_com(ic, 1, 1, 1, 1);
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index 7158ada291ab..93b01af1d222 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_dl.h>
#include <net/if_clone.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/if_types.h>
#include <net/ethernet.h>
#include <net/route.h>
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 6c3bb44053f5..12b34b2e0509 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_llc.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net/bpf.h>
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index b7d9c6f9457e..78483a3ad2e1 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_llc.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/if_vlan_var.h>
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 839f965f542f..0fbbb74e1e65 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#ifdef INET
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index f4f0d79b3ac3..100a0a385f84 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_llc.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 07cc8ed1c3ed..bf3e48761684 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_llc.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/if_vlan_var.h>
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 7e76a3ae9226..ec94f2cf7275 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/ethernet.h> /* XXX for ether_sprintf */
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
index 50b3151063fa..fd387e68e39f 100644
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c
index 4c184095ad35..1456fafd60a1 100644
--- a/sys/net80211/ieee80211_scan_sw.c
+++ b/sys/net80211/ieee80211_scan_sw.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_media.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net80211/ieee80211_var.h>
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c
index 719df1bcfacc..7dde2a609459 100644
--- a/sys/net80211/ieee80211_sta.c
+++ b/sys/net80211/ieee80211_sta.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_llc.h>
#include <net/if_dl.h>
#include <net/if_var.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net/bpf.h>
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
index 238b10a6e4ff..65a36a807d91 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_var.h>
#include <net/if_media.h>
#include <net/if_llc.h>
+#include <net/if_private.h>
#include <net/ethernet.h>
#include <net/bpf.h>
generated by cgit v1.3 (git 2.53.0) at 2026-09-04 22:52:32 +0000