diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 19ffc8ef1d1d..1a59382976e6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1225,12 +1225,12 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) | |||
1225 | 1225 | ||
1226 | switch (hdr->frame_control & | 1226 | switch (hdr->frame_control & |
1227 | cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) { | 1227 | cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) { |
1228 | case __constant_cpu_to_le16(IEEE80211_FCTL_TODS): | 1228 | case cpu_to_le16(IEEE80211_FCTL_TODS): |
1229 | if (unlikely(sdata->vif.type != NL80211_IFTYPE_AP && | 1229 | if (unlikely(sdata->vif.type != NL80211_IFTYPE_AP && |
1230 | sdata->vif.type != NL80211_IFTYPE_AP_VLAN)) | 1230 | sdata->vif.type != NL80211_IFTYPE_AP_VLAN)) |
1231 | return -1; | 1231 | return -1; |
1232 | break; | 1232 | break; |
1233 | case __constant_cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS): | 1233 | case cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS): |
1234 | if (unlikely(sdata->vif.type != NL80211_IFTYPE_WDS && | 1234 | if (unlikely(sdata->vif.type != NL80211_IFTYPE_WDS && |
1235 | sdata->vif.type != NL80211_IFTYPE_MESH_POINT)) | 1235 | sdata->vif.type != NL80211_IFTYPE_MESH_POINT)) |
1236 | return -1; | 1236 | return -1; |
@@ -1244,13 +1244,13 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) | |||
1244 | } | 1244 | } |
1245 | } | 1245 | } |
1246 | break; | 1246 | break; |
1247 | case __constant_cpu_to_le16(IEEE80211_FCTL_FROMDS): | 1247 | case cpu_to_le16(IEEE80211_FCTL_FROMDS): |
1248 | if (sdata->vif.type != NL80211_IFTYPE_STATION || | 1248 | if (sdata->vif.type != NL80211_IFTYPE_STATION || |
1249 | (is_multicast_ether_addr(dst) && | 1249 | (is_multicast_ether_addr(dst) && |
1250 | !compare_ether_addr(src, dev->dev_addr))) | 1250 | !compare_ether_addr(src, dev->dev_addr))) |
1251 | return -1; | 1251 | return -1; |
1252 | break; | 1252 | break; |
1253 | case __constant_cpu_to_le16(0): | 1253 | case cpu_to_le16(0): |
1254 | if (sdata->vif.type != NL80211_IFTYPE_ADHOC) | 1254 | if (sdata->vif.type != NL80211_IFTYPE_ADHOC) |
1255 | return -1; | 1255 | return -1; |
1256 | break; | 1256 | break; |