Hi all,
Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/sta_info.h between commit 4b5a433ae534 ("mac80211: call rate
control only after init") from the wireless tree and commit 83d5cc012441
("mac80211: station state transition error handling") from the net-next
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc net/mac80211/sta_info.h
index bfed851,381de37..0000000
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@@ -52,7 -52,7 +52,8 @@@
* @WLAN_STA_SP: Station is in a service period, so don't try to
* reply to other uAPSD trigger frames or PS-Poll.
* @WLAN_STA_4ADDR_EVENT: 4-addr event was already sent for this frame.
+ * @WLAN_STA_RATE_CONTROL: rate control was initialized for this station.
+ * @WLAN_STA_INSERTED: This station is inserted into the hash table.
*/
enum ieee80211_sta_info_flags {
WLAN_STA_AUTH,
@@@ -72,7 -72,7 +73,8 @@@
WLAN_STA_UAPSD,
WLAN_STA_SP,
WLAN_STA_4ADDR_EVENT,
+ WLAN_STA_RATE_CONTROL,
+ WLAN_STA_INSERTED,
};
enum ieee80211_sta_state {
Attachment:
pgplmZMm_Fh01.pgp
Description: PGP signature
