diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-08-28 17:01:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:50 -0400 |
commit | 13262ffd4902805acad2618c12b41fcaa6c50791 (patch) | |
tree | 2c5c250435c8464aa4c36253b3a86804e3a54814 /net/mac80211/rx.c | |
parent | d6f2da5b33911a31eb61e1790ef8e555e9605837 (diff) |
[MAC80211]: Remove bitfields from struct ieee80211_sub_if_data
mac80211, remove bitfields from struct ieee80211_sub_if_data
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index af94fb597415..b52e3305a8f8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1288,7 +1288,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, | |||
1288 | } else if (!multicast && | 1288 | } else if (!multicast && |
1289 | compare_ether_addr(sdata->dev->dev_addr, | 1289 | compare_ether_addr(sdata->dev->dev_addr, |
1290 | hdr->addr1) != 0) { | 1290 | hdr->addr1) != 0) { |
1291 | if (!sdata->promisc) | 1291 | if (!(sdata->flags & IEEE80211_SDATA_PROMISC)) |
1292 | return 0; | 1292 | return 0; |
1293 | rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; | 1293 | rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; |
1294 | } | 1294 | } |
@@ -1303,7 +1303,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, | |||
1303 | } else if (!multicast && | 1303 | } else if (!multicast && |
1304 | compare_ether_addr(sdata->dev->dev_addr, | 1304 | compare_ether_addr(sdata->dev->dev_addr, |
1305 | hdr->addr1) != 0) { | 1305 | hdr->addr1) != 0) { |
1306 | if (!sdata->promisc) | 1306 | if (!(sdata->flags & IEEE80211_SDATA_PROMISC)) |
1307 | return 0; | 1307 | return 0; |
1308 | rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; | 1308 | rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH; |
1309 | } else if (!rx->sta) | 1309 | } else if (!rx->sta) |