[Madwifi-cvs] revision 1513 committed by dyqith

[dyqith <svn...@ma...>]

Project     : madwifi
Revision    : 1513
Author      : dyqith
Date        : 2006-04-19 09:00:36 +0200 (Wed, 19 Apr 2006)

Log Message :
Fixed up some vap->iv_xrvap checks to hopefully fix ticket 429.

Signed-off-by: Daniel Wu <dy...@gm...>

Affected Files:
* trunk/net80211/ieee80211_beacon.c                   updated             
* trunk/net80211/ieee80211_input.c                    updated             
* trunk/net80211/ieee80211_linux.c                    updated             
* trunk/net80211/ieee80211_output.c                   updated             
* trunk/net80211/ieee80211_power.c                    updated             


Modified: trunk/net80211/ieee80211_beacon.c
===================================================================
--- trunk/net80211/ieee80211_beacon.c	2006-04-18 17:43:09 UTC (rev 1512)
+++ trunk/net80211/ieee80211_beacon.c	2006-04-19 07:00:36 UTC (rev 1513)
@@ -150,7 +150,7 @@
 			vap->iv_bss->ni_ath_defkeyindex);
 	bo->bo_xr = frm;
 #ifdef ATH_SUPERG_XR
-	if (vap->iv_ath_cap & IEEE80211_ATHC_XR)	/* XR */
+	if (vap->iv_xrvap && vap->iv_ath_cap & IEEE80211_ATHC_XR)	/* XR */
 		frm = ieee80211_add_xr_param(frm, vap);
 #endif
 	bo->bo_tim_trailerlen = frm - bo->bo_tim_trailer;

Modified: trunk/net80211/ieee80211_input.c
===================================================================
--- trunk/net80211/ieee80211_input.c	2006-04-18 17:43:09 UTC (rev 1512)
+++ trunk/net80211/ieee80211_input.c	2006-04-19 07:00:36 UTC (rev 1513)
@@ -969,7 +969,7 @@
 	 * device. XR vap has a net device which is not registered with
 	 * OS. 
 	 */
-	if (vap->iv_flags & IEEE80211_F_XR)
+	if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR)
 		dev = vap->iv_xrvap->iv_dev;
 #endif
 

Modified: trunk/net80211/ieee80211_linux.c
===================================================================
--- trunk/net80211/ieee80211_linux.c	2006-04-18 17:43:09 UTC (rev 1512)
+++ trunk/net80211/ieee80211_linux.c	2006-04-19 07:00:36 UTC (rev 1513)
@@ -196,7 +196,7 @@
 		IEEE80211_ADDR_COPY(wreq.addr.sa_data, ni->ni_bssid);
 		wreq.addr.sa_family = ARPHRD_ETHER;
 #ifdef ATH_SUPERG_XR
-		if (vap->iv_flags & IEEE80211_F_XR)
+		if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR)
 			dev = vap->iv_xrvap->iv_dev;
 #endif
 		wireless_send_event(dev, SIOCGIWAP, &wreq, NULL);
@@ -205,7 +205,7 @@
 		IEEE80211_ADDR_COPY(wreq.addr.sa_data, ni->ni_macaddr);
 		wreq.addr.sa_family = ARPHRD_ETHER;
 #ifdef ATH_SUPERG_XR
-		if (vap->iv_flags & IEEE80211_F_XR)
+		if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR)
 			dev = vap->iv_xrvap->iv_dev;
 #endif
 		wireless_send_event(dev, IWEVREGISTERED, &wreq, NULL);

Modified: trunk/net80211/ieee80211_output.c
===================================================================
--- trunk/net80211/ieee80211_output.c	2006-04-18 17:43:09 UTC (rev 1512)
+++ trunk/net80211/ieee80211_output.c	2006-04-19 07:00:36 UTC (rev 1513)
@@ -1871,7 +1871,7 @@
 			frm = ieee80211_add_athAdvCap(frm, vap->iv_bss->ni_ath_flags,
 				vap->iv_bss->ni_ath_defkeyindex); 
 #ifdef ATH_SUPERG_XR
-		if (vap->iv_ath_cap & IEEE80211_ATHC_XR)	/* XR */
+		if (vap->iv_xrvap && vap->iv_ath_cap & IEEE80211_ATHC_XR)	/* XR */
 			frm = ieee80211_add_xr_param(frm, vap);
 #endif
 		skb_trim(skb, frm - skb->data);

Modified: trunk/net80211/ieee80211_power.c
===================================================================
--- trunk/net80211/ieee80211_power.c	2006-04-18 17:43:09 UTC (rev 1512)
+++ trunk/net80211/ieee80211_power.c	2006-04-19 07:00:36 UTC (rev 1513)
@@ -307,7 +307,7 @@
 		 * device. XR vap has a net device which is not registered with
 		 * OS. 
 		 */
-		if (vap->iv_flags & IEEE80211_F_XR)
+		if (vap->iv_xrvap && vap->iv_flags & IEEE80211_F_XR)
 			skb->dev = vap->iv_xrvap->iv_dev;
 		else
 			skb->dev = vap->iv_dev;		/* XXX? unnecessary */