svn commit: r192563 - projects/mesh11s/sys/net80211
Rui Paulo
rpaulo at FreeBSD.org
Thu May 21 19:33:47 UTC 2009
Author: rpaulo
Date: Thu May 21 19:33:46 2009
New Revision: 192563
URL: http://svn.freebsd.org/changeset/base/192563
Log:
Sync with latest net80211.
Move sysctl creation out of freebsd.c.
Add some HWMP sysctl nodes.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/net80211/ieee80211_freebsd.c
projects/mesh11s/sys/net80211/ieee80211_hwmp.c
projects/mesh11s/sys/net80211/ieee80211_mesh.c
Modified: projects/mesh11s/sys/net80211/ieee80211_freebsd.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_freebsd.c Thu May 21 18:05:17 2009 (r192562)
+++ projects/mesh11s/sys/net80211/ieee80211_freebsd.c Thu May 21 19:33:46 2009 (r192563)
@@ -71,15 +71,6 @@ extern int ieee80211_cac_timeout;
SYSCTL_INT(_net_wlan, OID_AUTO, cac_timeout, CTLFLAG_RW,
&ieee80211_cac_timeout, 0, "CAC timeout (secs)");
-SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
- "IEEE 802.11s parameters");
-extern int ieee80211_mesh_ttl;
-SYSCTL_INT(_net_wlan_mesh, OID_AUTO, ttl, CTLTYPE_INT | CTLFLAG_RW,
- &ieee80211_mesh_ttl, 0, "TTL for mesh packets");
-extern int ieee80211_mesh_forwarding;
-SYSCTL_INT(_net_wlan_mesh, OID_AUTO, forwarding, CTLTYPE_INT | CTLFLAG_RW,
- &ieee80211_mesh_forwarding, 0, "Forward mesh packets");
-
MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state");
/*
Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Thu May 21 18:05:17 2009 (r192562)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Thu May 21 19:33:46 2009 (r192563)
@@ -78,3 +78,11 @@ int ieee80211_hwmp_replyforward = 1; /*
int ieee80211_hwmp_pathmaintenance = 2000;
int ieee80211_hwmp_confirmint = 2000;
+SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0,
+ "IEEE 802.11s HWMP parameters");
+SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, maxhops, CTLTYPE_INT | CTLFLAG_RW,
+ &ieee80211_hwmp_maxhops, 0, "Maximum number of hops for paths");
+#ifdef notyet
+SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, rootmode, CTLTYPE_INT | CTLFLAG_RW,
+ &ieee80211_hwmp_rootmode, 0, "Root Mesh Point Node");
+#endif
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 21 18:05:17 2009 (r192562)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 21 19:33:46 2009 (r192563)
@@ -64,10 +64,9 @@ __FBSDID("$FreeBSD$");
static void mesh_vattach(struct ieee80211vap *);
static int mesh_newstate(struct ieee80211vap *, enum ieee80211_state, int);
-static int mesh_input(struct ieee80211_node *, struct mbuf *, int, int,
- uint32_t);
+static int mesh_input(struct ieee80211_node *, struct mbuf *, int, int);
static void mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
- int, int, uint32_t);
+ int, int);
static void mesh_recv_action(struct ieee80211_node *, struct mbuf *);
static inline void mesh_peer_timeout_setup(struct ieee80211_node *);
static void mesh_peer_timeout_backoff(struct ieee80211_node *);
@@ -86,9 +85,15 @@ static const int ieee80211_mesh_holdingt
static const int ieee80211_mesh_confirmtimeout = 40;
#define CONFIRM_TIMEOUT msecs_to_ticks(ieee80211_mesh_confirmtimeout)
static const int ieee80211_mesh_maxretries = 2;
-/* non static for sysctl hookup */
-int ieee80211_mesh_ttl = 31;
-int ieee80211_mesh_forwarding = 1;
+static int ieee80211_mesh_ttl = 31;
+static int ieee80211_mesh_forwarding = 1;
+
+SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
+ "IEEE 802.11s parameters");
+SYSCTL_INT(_net_wlan_mesh, OID_AUTO, ttl, CTLTYPE_INT | CTLFLAG_RW,
+ &ieee80211_mesh_ttl, 0, "TTL for mesh packets");
+SYSCTL_INT(_net_wlan_mesh, OID_AUTO, forwarding, CTLTYPE_INT | CTLFLAG_RW,
+ &ieee80211_mesh_forwarding, 0, "Forward mesh packets");
static const char *nodemeshstates[] = {
"IDLE",
@@ -218,8 +223,7 @@ doprint(struct ieee80211vap *vap, int su
}
static int
-mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise,
- uint32_t rstamp)
+mesh_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int noise)
{
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211com *ic = ni->ni_ic;
@@ -378,7 +382,7 @@ mesh_input(struct ieee80211_node *ni, st
}
if (bpf_peers_present(vap->iv_rawbpf))
bpf_mtap(vap->iv_rawbpf, m);
- vap->iv_recv_mgmt(ni, m, subtype, rssi, noise, rstamp);
+ vap->iv_recv_mgmt(ni, m, subtype, rssi, noise);
goto out;
case IEEE80211_FC0_TYPE_CTL:
vap->iv_stats.is_rx_ctl++;
@@ -420,7 +424,7 @@ is11bclient(const uint8_t *rates, const
static void
mesh_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype,
- int rssi, int noise, uint32_t rstamp)
+ int rssi, int noise)
{
static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
struct ieee80211vap *vap = ni->ni_vap;
@@ -467,7 +471,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN;
}
ieee80211_add_scan(vap, &scan, wh,
- subtype, rssi, noise, rstamp);
+ subtype, rssi, noise);
return;
}
@@ -518,7 +522,6 @@ mesh_recv_mgmt(struct ieee80211_node *ni
if (ni != NULL) {
IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
ni->ni_noise = noise;
- ni->ni_rstamp = rstamp;
}
break;
More information about the svn-src-projects
mailing list