Re: net80211: remove redundant assignment to ic_curmode

2019-08-25 Thread Kevin Lo
On Sun, Aug 25, 2019 at 03:11:52PM +0200, Stefan Sperling wrote:
> 
> This assigment to ic_curmode is redundant because it already occurs
> inside ieee80211_setmode(), and channel information in selbs and ni
> is equivalent after node_copy().
> 
> ok?

ok kevlo@



net80211: remove redundant assignment to ic_curmode

2019-08-25 Thread Stefan Sperling
This assigment to ic_curmode is redundant because it already occurs
inside ieee80211_setmode(), and channel information in selbs and ni
is equivalent after node_copy().

ok?

diff refs/heads/roaming refs/heads/assignment
blob - 905396f216158f9497fc28be19737e61595adce3
blob + d41f910439aea2e7c45706e6fe384bd3ccc7269c
--- sys/net80211/ieee80211_node.c
+++ sys/net80211/ieee80211_node.c
@@ -1165,16 +1165,14 @@ ieee80211_node_join_bss(struct ieee80211com *ic, struc
mode = ieee80211_chan2mode(ic, selbs->ni_chan);
if (mode != ic->ic_curmode)
ieee80211_setmode(ic, mode);
 
(*ic->ic_node_copy)(ic, ic->ic_bss, selbs);
ni = ic->ic_bss;
 
-   ic->ic_curmode = ieee80211_chan2mode(ic, ni->ni_chan);
-
/* Make sure we send valid rates in an association request. */
if (ic->ic_opmode == IEEE80211_M_STA)
ieee80211_fix_rate(ic, ni,
IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
 
if (ic->ic_flags & IEEE80211_F_RSNON)