d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/net8021: Add missing braces in setcurchan().

Browse Source 
Obtained from:	DragonFlyBSD (git c69e37d6)
MFC after:	3 days
This commit is contained in:
Pedro F. Giffuni 2017-08-01 03:13:43 +00:00
parent f41e0df406
commit d2ffc7af30
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net80211/ieee80211_ioctl.c
View File

@ -2014,9 +2014,10 @@ setcurchan(struct ieee80211vap *vap, struct ieee80211_channel *c)
/* XXX need state machine for other vap's to follow */ /* XXX need state machine for other vap's to follow */
ieee80211_setcurchan(ic, vap->iv_des_chan); ieee80211_setcurchan(ic, vap->iv_des_chan);
vap->iv_bss->ni_chan = ic->ic_curchan; vap->iv_bss->ni_chan = ic->ic_curchan;
} else } else {
ic->ic_curchan = vap->iv_des_chan; ic->ic_curchan = vap->iv_des_chan;
ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan); ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
}
} else { } else {
/* /*
* Need to go through the state machine in case we * Need to go through the state machine in case we

2
sys/net80211/ieee80211_mesh.c
View File

@ -2630,7 +2630,7 @@ mesh_recv_action_meshgate(struct ieee80211_node *ni,
/* popagate only if decremented ttl >= 1 && forwarding is enabled */ /* popagate only if decremented ttl >= 1 && forwarding is enabled */
if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
return 0; return 0;
pgann.gann_flags = ie.gann_flags; /* Reserved */ pgann.gann_flags = ie.gann_flags; /* Reserved */
pgann.gann_hopcount = ie.gann_hopcount + 1; pgann.gann_hopcount = ie.gann_hopcount + 1;
pgann.gann_ttl = ie.gann_ttl - 1; pgann.gann_ttl = ie.gann_ttl - 1;
IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr); IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr);