diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-14 20:14:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:16 -0400 |
commit | 943ab70f6aebfdc0005ef7e58ae982e9ec22224b (patch) | |
tree | cf42f0564618d9399a6eadcd7007c18c78d9a9a6 /drivers/net/wireless/iwlwifi/iwl-sta.c | |
parent | e8986436580caf50ebbd3bf8371074aadf95aba5 (diff) |
iwlwifi: use ieee80211_is_data(fc)
iwl-agn-rs.c already uses this.
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: ipw3945-devel@lists.sourceforge.net
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index 2addf735b19..afa1633602a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -1044,11 +1044,10 @@ EXPORT_SYMBOL(iwl_rxon_add_station); | |||
1044 | int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) | 1044 | int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) |
1045 | { | 1045 | { |
1046 | int sta_id; | 1046 | int sta_id; |
1047 | u16 fc = le16_to_cpu(hdr->frame_control); | 1047 | __le16 fc = hdr->frame_control; |
1048 | 1048 | ||
1049 | /* If this frame is broadcast or management, use broadcast station id */ | 1049 | /* If this frame is broadcast or management, use broadcast station id */ |
1050 | if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) || | 1050 | if (!ieee80211_is_data(fc) || is_multicast_ether_addr(hdr->addr1)) |
1051 | is_multicast_ether_addr(hdr->addr1)) | ||
1052 | return priv->hw_params.bcast_sta_id; | 1051 | return priv->hw_params.bcast_sta_id; |
1053 | 1052 | ||
1054 | switch (priv->iw_mode) { | 1053 | switch (priv->iw_mode) { |