diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /net/mac80211/rx.c | |
| parent | 0a12761bcd5646691c5d16dd93df84d1b8849285 (diff) | |
| parent | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 72efbd87c1e..9a08f2c446c 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -81,8 +81,6 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local, | |||
| 81 | len += 8; | 81 | len += 8; |
| 82 | if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) | 82 | if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) |
| 83 | len += 1; | 83 | len += 1; |
| 84 | if (local->hw.flags & IEEE80211_HW_NOISE_DBM) | ||
| 85 | len += 1; | ||
| 86 | 84 | ||
| 87 | if (len & 1) /* padding for RX_FLAGS if necessary */ | 85 | if (len & 1) /* padding for RX_FLAGS if necessary */ |
| 88 | len++; | 86 | len++; |