staging: rtl8723au: rtw_cfg80211_inform_bss(): Report the beacon interval already...
authorJes Sorensen <Jes.Sorensen@redhat.com>
Thu, 19 Jun 2014 09:37:19 +0000 (11:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2014 20:08:50 +0000 (13:08 -0700)
Use the beacon interval we already retreived in collect_bss_info()
instead of pulling it out of the saved IE array again.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

index 2621a0ea7c89068cb41b2b83ca5dfd8cb46c79ae..ff838fcfea31b435de9480b9f55cd3d8b92ba4f6 100644 (file)
@@ -248,7 +248,6 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter,
        u16 channel;
        u32 freq;
        u16 notify_capability;
-       u16 notify_interval;
        u8 *notify_ie;
        size_t notify_ielen;
        s32 notify_signal;
@@ -266,9 +265,6 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter,
 
        notify_channel = ieee80211_get_channel(wiphy, freq);
 
-       notify_interval =
-               get_unaligned_le16(
-                       rtw_get_beacon_interval23a_from_ie(pnetwork->network.IEs));
        notify_capability =
                get_unaligned_le16(
                        rtw_get_capability23a_from_ie(pnetwork->network.IEs));
@@ -290,7 +286,8 @@ static int rtw_cfg80211_inform_bss(struct rtw_adapter *padapter,
        bss = cfg80211_inform_bss(wiphy, notify_channel,
                                  pnetwork->network.MacAddress,
                                  pnetwork->network.tsf,
-                                 notify_capability, notify_interval,
+                                 notify_capability,
+                                 pnetwork->network.BeaconPeriod,
                                  notify_ie, notify_ielen,
                                  notify_signal, GFP_ATOMIC);