[patch 5/5] d80211: allow wireless vlan interface to have same MAC an AP interface

[David Kimdon <david.kimdon@devicescape.com>]

[-- Attachment #1: vlan-macaddr.patch --]
[-- Type: text/plain, Size: 1044 bytes --]

Wireless vlan interfaces need to have the same mac address as
AP interfaces.  The STA must not see the change when it is bound to
a specific vlan, so the address of the vlan interface must be the same
as the address of the AP interface the station associated with.

Signed-off-by: David Kimdon <david.kimdon@devicescape.com>
 
Index: wireless-dev/net/d80211/ieee80211.c
===================================================================
--- wireless-dev.orig/net/d80211/ieee80211.c
+++ wireless-dev/net/d80211/ieee80211.c
@@ -2092,7 +2092,12 @@ static inline int identical_mac_addr_all
 		 type2 == IEEE80211_IF_TYPE_WDS) ||
 		(type1 == IEEE80211_IF_TYPE_WDS &&
 		 (type2 == IEEE80211_IF_TYPE_WDS ||
-		  type2 == IEEE80211_IF_TYPE_AP)));
+		  type2 == IEEE80211_IF_TYPE_AP)) ||
+		(type1 == IEEE80211_IF_TYPE_AP &&
+		 type2 == IEEE80211_IF_TYPE_VLAN) ||
+		(type1 == IEEE80211_IF_TYPE_VLAN &&
+		 (type2 == IEEE80211_IF_TYPE_AP ||
+		  type2 == IEEE80211_IF_TYPE_VLAN)));
 }
 
 static int ieee80211_master_open(struct net_device *dev)

--