aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-23 09:17:07 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-03-06 15:30:41 -0500
commit6032f934c818e5c3435c9f17274fe1983f53c6b4 (patch)
treec095cb07ffb67dd81df0d4d0573e060e132fe082 /net/mac80211/rx.c
parent2ec600d672e74488f8d1acf67a0a2baed222564c (diff)
mac80211: add mesh interface type
This adds the mesh interface type. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 48574f6c0e74..b7eeae0d3956 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1713,6 +1713,16 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
1713 rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb, 1713 rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb,
1714 bssid, hdr->addr2); 1714 bssid, hdr->addr2);
1715 break; 1715 break;
1716 case IEEE80211_IF_TYPE_MESH_POINT:
1717 if (!multicast &&
1718 compare_ether_addr(sdata->dev->dev_addr,
1719 hdr->addr1) != 0) {
1720 if (!(sdata->dev->flags & IFF_PROMISC))
1721 return 0;
1722
1723 rx->flags &= ~IEEE80211_TXRXD_RXRA_MATCH;
1724 }
1725 break;
1716 case IEEE80211_IF_TYPE_VLAN: 1726 case IEEE80211_IF_TYPE_VLAN:
1717 case IEEE80211_IF_TYPE_AP: 1727 case IEEE80211_IF_TYPE_AP:
1718 if (!bssid) { 1728 if (!bssid) {