summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2017-08-04 20:22:43 +0000
committerpfg <pfg@FreeBSD.org>2017-08-04 20:22:43 +0000
commit6bec222914c5ecdb296e21dd27fda5354e2f706e (patch)
treebc8e781c3543c2417ec5a6ba581d6ab3ac9993b1
parentebc558387908c1af01e13d650b4ab68f24f42866 (diff)
downloadFreeBSD-src-6bec222914c5ecdb296e21dd27fda5354e2f706e.zip
FreeBSD-src-6bec222914c5ecdb296e21dd27fda5354e2f706e.tar.gz
MFC r321838:
sys/net8021: Add missing braces in setcurchan(). Also fix some indentation. Obtained from: DragonFlyBSD (git c69e37d6)
-rw-r--r--sys/net80211/ieee80211_ioctl.c3
-rw-r--r--sys/net80211/ieee80211_mesh.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 5d323c0..0146cb0 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -1964,9 +1964,10 @@ setcurchan(struct ieee80211vap *vap, struct ieee80211_channel *c)
/* XXX need state machine for other vap's to follow */
ieee80211_setcurchan(ic, vap->iv_des_chan);
vap->iv_bss->ni_chan = ic->ic_curchan;
- } else
+ } else {
ic->ic_curchan = vap->iv_des_chan;
ic->ic_rt = ieee80211_get_ratetable(ic->ic_curchan);
+ }
} else {
/*
* Need to go through the state machine in case we
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index c8e69b7..585e7fb 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -2630,7 +2630,7 @@ mesh_recv_action_meshgate(struct ieee80211_node *ni,
/* popagate only if decremented ttl >= 1 && forwarding is enabled */
if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
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_ttl = ie.gann_ttl - 1;
IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr);
OpenPOWER on IntegriCloud