Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 4 Aug 2017 20:24:23 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r322061 - stable/10/sys/net80211
Message-ID:  <201708042024.v74KON0t018115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pfg
Date: Fri Aug  4 20:24:23 2017
New Revision: 322061
URL: https://svnweb.freebsd.org/changeset/base/322061

Log:
  MFC r321838:
  sys/net8021: Add missing braces in setcurchan().
  
  Also fix some indentation.
  
  Obtained from:	DragonFlyBSD (git c69e37d6)

Modified:
  stable/10/sys/net80211/ieee80211_ioctl.c
  stable/10/sys/net80211/ieee80211_mesh.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_ioctl.c	Fri Aug  4 20:22:43 2017	(r322060)
+++ stable/10/sys/net80211/ieee80211_ioctl.c	Fri Aug  4 20:24:23 2017	(r322061)
@@ -1970,9 +1970,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/10/sys/net80211/ieee80211_mesh.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_mesh.c	Fri Aug  4 20:22:43 2017	(r322060)
+++ stable/10/sys/net80211/ieee80211_mesh.c	Fri Aug  4 20:24:23 2017	(r322061)
@@ -2653,7 +2653,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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708042024.v74KON0t018115>