[Madwifi-cvs] revision 2027 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 2027
Author      : proski (Pavel Roskin)
Date        : 2007-01-30 04:14:33 +0100 (Tue, 30 Jan 2007)

Log Message :
Fix ni_wds shadowing found by sparse

Don't initialize ni_wds with NULL - it could suppress useful compiler
warnings if ni_wds is not initialized with a valid value.

Affected Files:
* trunk/net80211/ieee80211_input.c                    updated             


Modified: trunk/net80211/ieee80211_input.c
===================================================================
--- trunk/net80211/ieee80211_input.c	2007-01-30 03:04:18 UTC (rev 2026)
+++ trunk/net80211/ieee80211_input.c	2007-01-30 03:14:33 UTC (rev 2027)
@@ -220,7 +220,6 @@
 #define	HAS_SEQ(type)	((type & 0x4) == 0)
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = vap->iv_ic;
-	struct ieee80211_node *ni_wds = NULL;
 	struct net_device *dev = vap->iv_dev;
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
@@ -487,7 +486,7 @@
 				 */
 				if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) {
 					struct ieee80211_node_table *nt;
-					struct ieee80211_node *ni_wds = NULL;
+					struct ieee80211_node *ni_wds;
 					nt = &ic->ic_sta;
 					ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3);
 					if (ni_wds) {
@@ -548,6 +547,7 @@
 			if (dir == IEEE80211_FC1_DIR_DSTODS) {
 				struct ieee80211_node_table *nt;
 				struct ieee80211_frame_addr4 *wh4;
+				struct ieee80211_node *ni_wds;
 				if (!(vap->iv_flags_ext & IEEE80211_FEXT_WDS)) {
 					IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
 						wh, "data", "%s", "4 addr not allowed");