Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

mac80211: notify channel switch at the end of ieee80211_chswitch_post_beacon()

The call to cfg80211_ch_switch_notify() should be at the end of the
ieee80211_chswitch_post_beacon() function, because it should only be
sent if everything succeeded.

Fixes: d04b5ac9e70b ("cfg80211/mac80211: allow any interface to send channel switch notifications")
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Luciano Coelho 10 years ago
parent
d295445715
commit
688b1ecfb9
1 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      net/mac80211/mlme.c

+ 2 - 2
net/mac80211/mlme.c
View File 

@@ -1053,8 +1053,6 @@ static void ieee80211_chswitch_post_beacon(struct ieee80211_sub_if_data *sdata)
 
 		sdata->csa_block_tx = false;
 
 		sdata->csa_block_tx = false;
 
 	}
 
 	}
 
 
 
-	cfg80211_ch_switch_notify(sdata->dev, &sdata->reserved_chandef);
 
-
 
 	sdata->vif.csa_active = false;
 
 	sdata->vif.csa_active = false;
 
 	ifmgd->csa_waiting_bcn = false;
 
 	ifmgd->csa_waiting_bcn = false;
 
 
 
@@ -1066,6 +1064,8 @@ static void ieee80211_chswitch_post_beacon(struct ieee80211_sub_if_data *sdata)
 
 				     &ifmgd->csa_connection_drop_work);
 
 				     &ifmgd->csa_connection_drop_work);
 
 		return;
 
 		return;
 
 	}
 
 	}
 
+
 
+	cfg80211_ch_switch_notify(sdata->dev, &sdata->reserved_chandef);
 
 }
 
 }
 
 
 
 void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success)
 
 void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success)