PERFORCE change 133063 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=133063

Change 133063 by sam at sam_ebb on 2008/01/11 20:40:31

	add local mac address to vap create

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#18 edit
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#22 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#18 (text+ko) ====

@@ -293,7 +293,8 @@
 int
 ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap,
 	const char name[IFNAMSIZ], int unit, int opmode, int flags,
-	const uint8_t bssid[IEEE80211_ADDR_LEN])
+	const uint8_t bssid[IEEE80211_ADDR_LEN],
+	const uint8_t macaddr[IEEE80211_ADDR_LEN])
 {
 #define	IEEE80211_C_OPMODE \
 	(IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | IEEE80211_C_AHDEMO | \
@@ -389,7 +390,7 @@
 	 */
 	vap->iv_reset = default_reset;
 
-	IEEE80211_ADDR_COPY(vap->iv_myaddr, ic->ic_myaddr);
+	IEEE80211_ADDR_COPY(vap->iv_myaddr, macaddr);
 
 	ieee80211_sysctl_vattach(vap);
 	ieee80211_crypto_vattach(vap);

==== //depot/projects/vap/sys/net80211/ieee80211_var.h#22 (text+ko) ====

@@ -191,7 +191,8 @@
 	struct ieee80211vap*	(*ic_vap_create)(struct ieee80211com *,
 				    const char name[IFNAMSIZ], int unit,
 				    int opmode, int flags,
-				    const uint8_t bssid[IEEE80211_ADDR_LEN]);
+				    const uint8_t bssid[IEEE80211_ADDR_LEN],
+				    const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 	void			(*ic_vap_delete)(struct ieee80211vap *);
 	/* operating mode attachment */
 	ieee80211vap_attach	ic_vattach[IEEE80211_OPMODE_MAX];
@@ -521,7 +522,8 @@
 void	ieee80211_ifdetach(struct ieee80211com *);
 int	ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
 		const char name[IFNAMSIZ], int unit, int opmode, int flags,
-		const uint8_t bssid[IEEE80211_ADDR_LEN]);
+		const uint8_t bssid[IEEE80211_ADDR_LEN],
+		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
 int	ieee80211_vap_attach(struct ieee80211vap *,
 		ifm_change_cb_t, ifm_stat_cb_t);
 void	ieee80211_vap_detach(struct ieee80211vap *);