diff options
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 15d7f00513be..d13ae9c299f2 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -2003,7 +2003,6 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2003 | s32 err = 0; | 2003 | s32 err = 0; |
2004 | u16 channel; | 2004 | u16 channel; |
2005 | u32 freq; | 2005 | u32 freq; |
2006 | u64 notify_timestamp; | ||
2007 | u16 notify_capability; | 2006 | u16 notify_capability; |
2008 | u16 notify_interval; | 2007 | u16 notify_interval; |
2009 | u8 *notify_ie; | 2008 | u8 *notify_ie; |
@@ -2026,7 +2025,6 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2026 | freq = ieee80211_channel_to_frequency(channel, band->band); | 2025 | freq = ieee80211_channel_to_frequency(channel, band->band); |
2027 | notify_channel = ieee80211_get_channel(wiphy, freq); | 2026 | notify_channel = ieee80211_get_channel(wiphy, freq); |
2028 | 2027 | ||
2029 | notify_timestamp = jiffies_to_msecs(jiffies)*1000; /* uSec */ | ||
2030 | notify_capability = le16_to_cpu(bi->capability); | 2028 | notify_capability = le16_to_cpu(bi->capability); |
2031 | notify_interval = le16_to_cpu(bi->beacon_period); | 2029 | notify_interval = le16_to_cpu(bi->beacon_period); |
2032 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); | 2030 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); |
@@ -2040,10 +2038,9 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2040 | WL_CONN("Capability: %X\n", notify_capability); | 2038 | WL_CONN("Capability: %X\n", notify_capability); |
2041 | WL_CONN("Beacon interval: %d\n", notify_interval); | 2039 | WL_CONN("Beacon interval: %d\n", notify_interval); |
2042 | WL_CONN("Signal: %d\n", notify_signal); | 2040 | WL_CONN("Signal: %d\n", notify_signal); |
2043 | WL_CONN("notify_timestamp: %#018llx\n", notify_timestamp); | ||
2044 | 2041 | ||
2045 | bss = cfg80211_inform_bss(wiphy, notify_channel, (const u8 *)bi->BSSID, | 2042 | bss = cfg80211_inform_bss(wiphy, notify_channel, (const u8 *)bi->BSSID, |
2046 | notify_timestamp, notify_capability, notify_interval, notify_ie, | 2043 | 0, notify_capability, notify_interval, notify_ie, |
2047 | notify_ielen, notify_signal, GFP_KERNEL); | 2044 | notify_ielen, notify_signal, GFP_KERNEL); |
2048 | 2045 | ||
2049 | if (!bss) | 2046 | if (!bss) |
@@ -2098,7 +2095,6 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2098 | s32 err = 0; | 2095 | s32 err = 0; |
2099 | u16 channel; | 2096 | u16 channel; |
2100 | u32 freq; | 2097 | u32 freq; |
2101 | u64 notify_timestamp; | ||
2102 | u16 notify_capability; | 2098 | u16 notify_capability; |
2103 | u16 notify_interval; | 2099 | u16 notify_interval; |
2104 | u8 *notify_ie; | 2100 | u8 *notify_ie; |
@@ -2134,7 +2130,6 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2134 | freq = ieee80211_channel_to_frequency(channel, band->band); | 2130 | freq = ieee80211_channel_to_frequency(channel, band->band); |
2135 | notify_channel = ieee80211_get_channel(wiphy, freq); | 2131 | notify_channel = ieee80211_get_channel(wiphy, freq); |
2136 | 2132 | ||
2137 | notify_timestamp = jiffies_to_msecs(jiffies)*1000; /* uSec */ | ||
2138 | notify_capability = le16_to_cpu(bi->capability); | 2133 | notify_capability = le16_to_cpu(bi->capability); |
2139 | notify_interval = le16_to_cpu(bi->beacon_period); | 2134 | notify_interval = le16_to_cpu(bi->beacon_period); |
2140 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); | 2135 | notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); |
@@ -2145,10 +2140,9 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv, | |||
2145 | WL_CONN("capability: %X\n", notify_capability); | 2140 | WL_CONN("capability: %X\n", notify_capability); |
2146 | WL_CONN("beacon interval: %d\n", notify_interval); | 2141 | WL_CONN("beacon interval: %d\n", notify_interval); |
2147 | WL_CONN("signal: %d\n", notify_signal); | 2142 | WL_CONN("signal: %d\n", notify_signal); |
2148 | WL_CONN("notify_timestamp: %#018llx\n", notify_timestamp); | ||
2149 | 2143 | ||
2150 | bss = cfg80211_inform_bss(wiphy, notify_channel, bssid, | 2144 | bss = cfg80211_inform_bss(wiphy, notify_channel, bssid, |
2151 | notify_timestamp, notify_capability, notify_interval, | 2145 | 0, notify_capability, notify_interval, |
2152 | notify_ie, notify_ielen, notify_signal, GFP_KERNEL); | 2146 | notify_ie, notify_ielen, notify_signal, GFP_KERNEL); |
2153 | 2147 | ||
2154 | if (!bss) { | 2148 | if (!bss) { |