diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:52:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:52:37 -0400 |
| commit | f42a44494bcdf03fc851c03d438464d59c0ceaf5 (patch) | |
| tree | 986ea7b54e9fc79a64863fd7e92eabd99ffd37a3 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | 63fe46da9c380b3f2bbdf3765044649517cc717c (diff) | |
| parent | ef85ad541f9a6ccd3f89ec73f92b2d6f45a9d3e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 61510c519351..3a49c256789f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -600,9 +600,9 @@ void rt2x00lib_rxdone(struct queue_entry *entry, | |||
| 600 | rt2x00dev->link.qual.rx_success++; | 600 | rt2x00dev->link.qual.rx_success++; |
| 601 | 601 | ||
| 602 | rx_status->rate_idx = idx; | 602 | rx_status->rate_idx = idx; |
| 603 | rx_status->signal = | 603 | rx_status->qual = |
| 604 | rt2x00lib_calculate_link_signal(rt2x00dev, rxdesc->rssi); | 604 | rt2x00lib_calculate_link_signal(rt2x00dev, rxdesc->rssi); |
| 605 | rx_status->ssi = rxdesc->rssi; | 605 | rx_status->signal = rxdesc->rssi; |
| 606 | rx_status->flag = rxdesc->flags; | 606 | rx_status->flag = rxdesc->flags; |
| 607 | rx_status->antenna = rt2x00dev->link.ant.active.rx; | 607 | rx_status->antenna = rt2x00dev->link.ant.active.rx; |
| 608 | 608 | ||