From d2ffc7af304d3e8505006d89239cc9936bd71720 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Tue, 1 Aug 2017 03:13:43 +0000 Subject: [PATCH] sys/net8021: Add missing braces in setcurchan(). Obtained from: DragonFlyBSD (git c69e37d6) MFC after: 3 days --- sys/net80211/ieee80211_ioctl.c | 3 ++- sys/net80211/ieee80211_mesh.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 9939ca34bb8..6b5d441183f 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2014,9 +2014,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 1b6ff3c089c..e632b5d1e2f 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);