svn commit: r195567 - projects/mesh11s/sys/net80211
Rui Paulo
rpaulo at FreeBSD.org
Fri Jul 10 16:40:29 UTC 2009
Author: rpaulo
Date: Fri Jul 10 16:40:28 2009
New Revision: 195567
URL: http://svn.freebsd.org/changeset/base/195567
Log:
whitespace fix
Modified:
projects/mesh11s/sys/net80211/ieee80211_mesh.c
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 10 16:38:16 2009 (r195566)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jul 10 16:40:28 2009 (r195567)
@@ -148,43 +148,43 @@ struct ieee80211_mesh_route *
ieee80211_mesh_rt_find(struct ieee80211vap *vap,
const uint8_t dest[IEEE80211_ADDR_LEN])
{
- struct ieee80211_mesh_state *ms = vap->iv_mesh;
- struct ieee80211_mesh_route *rt;
+ struct ieee80211_mesh_state *ms = vap->iv_mesh;
+ struct ieee80211_mesh_route *rt;
- MESH_RT_LOCK(ms);
- TAILQ_FOREACH(rt, &ms->ms_routes, rt_next) {
- if (IEEE80211_ADDR_EQ(dest, rt->rt_dest)) {
- MESH_RT_UNLOCK(ms);
- return rt;
- }
- }
- MESH_RT_UNLOCK(ms);
- return NULL;
+ MESH_RT_LOCK(ms);
+ TAILQ_FOREACH(rt, &ms->ms_routes, rt_next) {
+ if (IEEE80211_ADDR_EQ(dest, rt->rt_dest)) {
+ MESH_RT_UNLOCK(ms);
+ return rt;
+ }
+ }
+ MESH_RT_UNLOCK(ms);
+ return NULL;
}
struct ieee80211_mesh_route *
ieee80211_mesh_rt_add(struct ieee80211vap *vap,
const uint8_t dest[IEEE80211_ADDR_LEN])
{
- struct ieee80211_mesh_state *ms = vap->iv_mesh;
- struct ieee80211_mesh_route *rt;
+ struct ieee80211_mesh_state *ms = vap->iv_mesh;
+ struct ieee80211_mesh_route *rt;
- KASSERT(ieee80211_mesh_rt_find(vap, dest) == NULL,
- ("%s: duplicate entry in the routing table", __func__));
- KASSERT(!IEEE80211_ADDR_EQ(vap->iv_myaddr, dest),
- ("%s: adding self to the routing table", __func__));
- KASSERT(!IEEE80211_ADDR_EQ(broadcastaddr, dest),
- ("%s: adding broadcast to the routing table", __func__));
-
- rt = malloc(sizeof(struct ieee80211_mesh_route), M_80211_MESH_RT,
- M_NOWAIT | M_ZERO);
- IEEE80211_ADDR_COPY(rt->rt_dest, dest);
+ KASSERT(ieee80211_mesh_rt_find(vap, dest) == NULL,
+ ("%s: duplicate entry in the routing table", __func__));
+ KASSERT(!IEEE80211_ADDR_EQ(vap->iv_myaddr, dest),
+ ("%s: adding self to the routing table", __func__));
+ KASSERT(!IEEE80211_ADDR_EQ(broadcastaddr, dest),
+ ("%s: adding broadcast to the routing table", __func__));
+
+ rt = malloc(sizeof(struct ieee80211_mesh_route), M_80211_MESH_RT,
+ M_NOWAIT | M_ZERO);
+ IEEE80211_ADDR_COPY(rt->rt_dest, dest);
rt->rt_priv = malloc(ms->ms_ppath->mpp_privlen, M_80211_MESH_RT,
M_NOWAIT | M_ZERO);
- MESH_RT_LOCK(ms);
- TAILQ_INSERT_TAIL(&ms->ms_routes, rt, rt_next);
- MESH_RT_UNLOCK(ms);
- return rt;
+ MESH_RT_LOCK(ms);
+ TAILQ_INSERT_TAIL(&ms->ms_routes, rt, rt_next);
+ MESH_RT_UNLOCK(ms);
+ return rt;
}
void
@@ -409,11 +409,11 @@ mesh_vattach(struct ieee80211vap *vap)
vap->iv_opdetach = mesh_vdetach;
vap->iv_recv_mgmt = mesh_recv_mgmt;
ms = malloc(sizeof(struct ieee80211_mesh_state), M_80211_VAP,
- M_NOWAIT | M_ZERO);
- if (ms == NULL) {
- printf("%s: couldn't alloc MBSS state\n", __func__);
- return;
- }
+ M_NOWAIT | M_ZERO);
+ if (ms == NULL) {
+ printf("%s: couldn't alloc MBSS state\n", __func__);
+ return;
+ }
vap->iv_mesh = ms;
ms->ms_seq = 0;
ms->ms_flags = (IEEE80211_MESHFLAGS_AP | IEEE80211_MESHFLAGS_FWD);
@@ -440,13 +440,13 @@ mesh_newstate(struct ieee80211vap *vap,
IEEE80211_LOCK_ASSERT(ic);
- ostate = vap->iv_state;
- IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
- __func__, ieee80211_state_name[ostate],
- ieee80211_state_name[nstate], arg);
- vap->iv_state = nstate; /* state transition */
- if (ostate != IEEE80211_S_SCAN)
- ieee80211_cancel_scan(vap); /* background scan */
+ ostate = vap->iv_state;
+ IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
+ __func__, ieee80211_state_name[ostate],
+ ieee80211_state_name[nstate], arg);
+ vap->iv_state = nstate; /* state transition */
+ if (ostate != IEEE80211_S_SCAN)
+ ieee80211_cancel_scan(vap); /* background scan */
ni = vap->iv_bss; /* NB: no reference held */
/* Flush the routing table */
if (nstate != IEEE80211_S_INIT && ostate == IEEE80211_S_INIT)
@@ -667,12 +667,12 @@ static struct ieee80211_node *
mesh_find_txnode(struct ieee80211vap *vap,
const uint8_t dest[IEEE80211_ADDR_LEN])
{
- struct ieee80211_mesh_route *rt;
+ struct ieee80211_mesh_route *rt;
- rt = ieee80211_mesh_rt_find(vap, dest);
- if (rt == NULL)
- return NULL;
- return ieee80211_find_txnode(vap, rt->rt_nexthop);
+ rt = ieee80211_mesh_rt_find(vap, dest);
+ if (rt == NULL)
+ return NULL;
+ return ieee80211_find_txnode(vap, rt->rt_nexthop);
}
/*
@@ -1027,7 +1027,7 @@ mesh_input(struct ieee80211_node *ni, st
wh, "bad", "frame type 0x%x", type);
/* should not come here */
break;
- }
+ }
err:
ifp->if_ierrors++;
out:
@@ -1067,7 +1067,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
* Count frame now that we know it's to be processed.
*/
if (subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
- vap->iv_stats.is_rx_beacon++; /* XXX remove */
+ vap->iv_stats.is_rx_beacon++; /* XXX remove */
IEEE80211_NODE_STAT(ni, rx_beacons);
} else
IEEE80211_NODE_STAT(ni, rx_proberesp);
@@ -1173,7 +1173,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
/* frame must be directed */
IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
wh, NULL, "%s", "not unicast");
- vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */
+ vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */
return;
}
/*
@@ -1182,7 +1182,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
* [tlv] supported rates
* [tlv] extended supported rates
* [tlv] mesh id
- */
+ */
ssid = meshid = rates = xrates = NULL;
sfrm = frm;
while (efrm - frm > 1) {
@@ -2272,15 +2272,15 @@ ieee80211_add_meshpeer(uint8_t *frm, uin
* Max 802.11s overhead.
*/
#define IEEE80211_MESH_MAXOVERHEAD \
- (sizeof(struct ieee80211_qosframe_addr4) \
+ (sizeof(struct ieee80211_qosframe_addr4) \
+ sizeof(struct ieee80211_meshcntl_ae11) \
- + sizeof(struct llc) \
- + IEEE80211_ADDR_LEN \
- + IEEE80211_WEP_IVLEN \
- + IEEE80211_WEP_KIDLEN \
- + IEEE80211_WEP_CRCLEN \
- + IEEE80211_WEP_MICLEN \
- + IEEE80211_CRC_LEN)
+ + sizeof(struct llc) \
+ + IEEE80211_ADDR_LEN \
+ + IEEE80211_WEP_IVLEN \
+ + IEEE80211_WEP_KIDLEN \
+ + IEEE80211_WEP_CRCLEN \
+ + IEEE80211_WEP_MICLEN \
+ + IEEE80211_CRC_LEN)
uint32_t
mesh_airtime_calc(struct ieee80211_node *ni)
{
@@ -2439,8 +2439,8 @@ mesh_ioctl_get80211(struct ieee80211vap
return EINVAL;
default:
return ENOSYS;
- }
- break;
+ }
+ break;
case IEEE80211_IOC_MESH_PR_METRIC:
len = strlen(ms->ms_pmetric->mpm_descr);
if (ireq->i_len < len)
More information about the svn-src-projects
mailing list