aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index ee4331229f1f..0c736735e217 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -638,7 +638,7 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr,
638 638
639 memset(&status, 0, sizeof(status)); 639 memset(&status, 0, sizeof(status));
640 status.flags = IEEE80211_TX_STATUS_ACK; 640 status.flags = IEEE80211_TX_STATUS_ACK;
641 status.ack_signal = stats->ssi; 641 status.ack_signal = stats->signal;
642 __skb_unlink(skb, q); 642 __skb_unlink(skb, q);
643 tx_status(hw, skb, &status, 1); 643 tx_status(hw, skb, &status, 1);
644 goto out; 644 goto out;
@@ -691,8 +691,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
691 691
692 stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq; 692 stats.freq = zd_channels[_zd_chip_get_channel(&mac->chip) - 1].center_freq;
693 stats.band = IEEE80211_BAND_2GHZ; 693 stats.band = IEEE80211_BAND_2GHZ;
694 stats.ssi = status->signal_strength; 694 stats.signal = status->signal_strength;
695 stats.signal = zd_rx_qual_percent(buffer, 695 stats.qual = zd_rx_qual_percent(buffer,
696 length - sizeof(struct rx_status), 696 length - sizeof(struct rx_status),
697 status); 697 status);
698 698
@@ -997,10 +997,10 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
997 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band; 997 hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band;
998 998
999 hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | 999 hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
1000 IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE; 1000 IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
1001 hw->max_rssi = 100; 1001 IEEE80211_HW_SIGNAL_DB;
1002 hw->max_signal = 100;
1003 1002
1003 hw->max_signal = 100;
1004 hw->queues = 1; 1004 hw->queues = 1;
1005 hw->extra_tx_headroom = sizeof(struct zd_ctrlset); 1005 hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
1006 1006