diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/hostap/hostap.c b/drivers/net/wireless/hostap/hostap.c index 9ce18b6d6cb8..e7f5821b4942 100644 --- a/drivers/net/wireless/hostap/hostap.c +++ b/drivers/net/wireless/hostap/hostap.c | |||
@@ -597,8 +597,8 @@ void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx) | |||
597 | fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4, | 597 | fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4, |
598 | __le16_to_cpu(rx->duration_id), __le16_to_cpu(rx->seq_ctrl), | 598 | __le16_to_cpu(rx->duration_id), __le16_to_cpu(rx->seq_ctrl), |
599 | __le16_to_cpu(rx->data_len), | 599 | __le16_to_cpu(rx->data_len), |
600 | fc & WLAN_FC_TODS ? " [ToDS]" : "", | 600 | fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "", |
601 | fc & WLAN_FC_FROMDS ? " [FromDS]" : ""); | 601 | fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : ""); |
602 | 602 | ||
603 | printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4=" | 603 | printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4=" |
604 | MACSTR "\n", | 604 | MACSTR "\n", |
@@ -626,8 +626,8 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx) | |||
626 | fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4, | 626 | fc, WLAN_FC_GET_TYPE(fc) >> 2, WLAN_FC_GET_STYPE(fc) >> 4, |
627 | __le16_to_cpu(tx->duration_id), __le16_to_cpu(tx->seq_ctrl), | 627 | __le16_to_cpu(tx->duration_id), __le16_to_cpu(tx->seq_ctrl), |
628 | __le16_to_cpu(tx->data_len), | 628 | __le16_to_cpu(tx->data_len), |
629 | fc & WLAN_FC_TODS ? " [ToDS]" : "", | 629 | fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "", |
630 | fc & WLAN_FC_FROMDS ? " [FromDS]" : ""); | 630 | fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : ""); |
631 | 631 | ||
632 | printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4=" | 632 | printk(KERN_DEBUG " A1=" MACSTR " A2=" MACSTR " A3=" MACSTR " A4=" |
633 | MACSTR "\n", | 633 | MACSTR "\n", |
@@ -668,7 +668,7 @@ int hostap_80211_get_hdrlen(u16 fc) | |||
668 | 668 | ||
669 | switch (WLAN_FC_GET_TYPE(fc)) { | 669 | switch (WLAN_FC_GET_TYPE(fc)) { |
670 | case IEEE80211_FTYPE_DATA: | 670 | case IEEE80211_FTYPE_DATA: |
671 | if ((fc & WLAN_FC_FROMDS) && (fc & WLAN_FC_TODS)) | 671 | if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) |
672 | hdrlen = 30; /* Addr4 */ | 672 | hdrlen = 30; /* Addr4 */ |
673 | break; | 673 | break; |
674 | case IEEE80211_FTYPE_CTL: | 674 | case IEEE80211_FTYPE_CTL: |