diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-30 21:25:08 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-30 21:25:08 +0100 |
| commit | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (patch) | |
| tree | 9b4478941c486d47a71bfce455b896c5dda7e811 /include/net/mac80211.h | |
| parent | mac80211: annotate sleeping driver ops (diff) | |
| parent | Revert "b43: Enforce DMA descriptor memory constraints" (diff) | |
| download | linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.tar.xz linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/libertas/scan.c
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5ee666ae4c88..f073a2a50574 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -547,7 +547,6 @@ enum mac80211_rx_flags { * unspecified depending on the hardware capabilities flags * @IEEE80211_HW_SIGNAL_* * @noise: noise when receiving this frame, in dBm. - * @qual: overall signal quality indication, in percent (0-100). * @antenna: antenna used * @rate_idx: index of data rate into band's supported rates or MCS index if * HT rates are use (RX_FLAG_HT) @@ -559,7 +558,6 @@ struct ieee80211_rx_status { int freq; int signal; int noise; - int __deprecated qual; int antenna; int rate_idx; int flag; |