diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-20 09:11:39 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-22 17:54:10 +0200 |
| commit | 7fe3016f24296ec88100113c9671fa605a71c44e (patch) | |
| tree | aac88623447c95badc6b0ffa1874b6b6b05ad616 /drivers/net/wireless/mwifiex/uap_event.c | |
| parent | 57d7b6a4cda5a5247ab3b98a16a020af8e4f03fa (diff) | |
| parent | c1e140bf79d817d4a7aa9932eb98b0359c87af33 (diff) | |
Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next
Some further updates for net-next:
* fix network-manager which was broken by the previous changes
* fix delete-station events, which were broken by me making the
genlmsg_end() mistake
* fix a timer left running during suspend in some race conditions
that would cause an annoying (but harmless) warning
* (less important, but in the tree already) remove 80+80 MHz rate
reporting since the spec doesn't distinguish it from 160 MHz;
as the bitrate they're both 160 MHz bandwidth
Diffstat (limited to 'drivers/net/wireless/mwifiex/uap_event.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/uap_event.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/mwifiex/uap_event.c index c54a537e31fb..3b3a970e2086 100644 --- a/drivers/net/wireless/mwifiex/uap_event.c +++ b/drivers/net/wireless/mwifiex/uap_event.c @@ -68,7 +68,6 @@ int mwifiex_process_uap_event(struct mwifiex_private *priv) len = ETH_ALEN; if (len != -1) { - sinfo.filled = STATION_INFO_ASSOC_REQ_IES; sinfo.assoc_req_ies = &event->data[len]; len = (u8 *)sinfo.assoc_req_ies - (u8 *)&event->frame_control; |