diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-15 13:05:21 -0400 |
| commit | 39c253ed7817bf477189a132b114303c9aa2c2d2 (patch) | |
| tree | 194492ef6dd74a87e074698368cb1817624783fc /net/mac80211/util.c | |
| parent | e9e4ea74f06635f2ffc1dffe5ef40c854faa0a90 (diff) | |
| parent | 9612bd1ee3e3136e4748d7175bb6e7551482cc2e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 9c3200bcfc02..69e4ef5348a0 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
| @@ -2238,6 +2238,10 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, | |||
| 2238 | } | 2238 | } |
| 2239 | 2239 | ||
| 2240 | rate = cfg80211_calculate_bitrate(&ri); | 2240 | rate = cfg80211_calculate_bitrate(&ri); |
| 2241 | if (WARN_ONCE(!rate, | ||
| 2242 | "Invalid bitrate: flags=0x%x, idx=%d, vht_nss=%d\n", | ||
| 2243 | status->flag, status->rate_idx, status->vht_nss)) | ||
| 2244 | return 0; | ||
| 2241 | 2245 | ||
| 2242 | /* rewind from end of MPDU */ | 2246 | /* rewind from end of MPDU */ |
| 2243 | if (status->flag & RX_FLAG_MACTIME_END) | 2247 | if (status->flag & RX_FLAG_MACTIME_END) |