Author: pfg
Date: Fri Aug 4 20:22:43 2017
New Revision: 322060
URL: https://svnweb.freebsd.org/changeset/base/322060
Log:
MFC r321838:
sys/net8021: Add missing braces in setcurchan().
Also fix some indentation.
Obtained from: DragonFlyBSD (git c69e37d6)
Modified:
stable/11/sys/net80211/ieee80211_ioctl.c
stable/11/sys/net80211/ieee80211_mesh.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_ioctl.c Fri Aug 4 18:02:54 2017
(r322059)
+++ stable/11/sys/net80211/ieee80211_ioctl.c Fri Aug 4 20:22:43 2017
(r322060)
@@ -1964,9 +1964,10 @@ setcurchan(struct ieee80211vap *vap, struct ieee80211_
/* 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
Modified: stable/11/sys/net80211/ieee80211_mesh.c
==============================================================================
--- stable/11/sys/net80211/ieee80211_mesh.c Fri Aug 4 18:02:54 2017
(r322059)
+++ stable/11/sys/net80211/ieee80211_mesh.c Fri Aug 4 20:22:43 2017
(r322060)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
