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 /drivers/net/wireless/rt2x00/rt2x00dev.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 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index eda73ba735a6..3ae468c4d760 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -435,7 +435,6 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev, | |||
| 435 | rx_status->mactime = rxdesc.timestamp; | 435 | rx_status->mactime = rxdesc.timestamp; |
| 436 | rx_status->rate_idx = rate_idx; | 436 | rx_status->rate_idx = rate_idx; |
| 437 | rx_status->signal = rxdesc.rssi; | 437 | rx_status->signal = rxdesc.rssi; |
| 438 | rx_status->noise = rxdesc.noise; | ||
| 439 | rx_status->flag = rxdesc.flags; | 438 | rx_status->flag = rxdesc.flags; |
| 440 | rx_status->antenna = rt2x00dev->link.ant.active.rx; | 439 | rx_status->antenna = rt2x00dev->link.ant.active.rx; |
| 441 | 440 | ||