svn commit: r203422 - head/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Wed Feb  3 10:07:43 2010
New Revision: 203422
URL: http://svn.freebsd.org/changeset/base/203422

Log:
  When taking the AMPDU reorder fastpath, need_tap wasn't being
  initialized. Initialize on declaration to avoid this.
  
  Found with:	clang static analyzer

Modified:
  head/sys/net80211/ieee80211_adhoc.c
  head/sys/net80211/ieee80211_hostap.c
  head/sys/net80211/ieee80211_ioctl.h
  head/sys/net80211/ieee80211_sta.c
  head/sys/net80211/ieee80211_wds.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c	Wed Feb  3 10:06:03 2010	(r203421)
+++ head/sys/net80211/ieee80211_adhoc.c	Wed Feb  3 10:07:43 2010	(r203422)
@@ -293,7 +293,7 @@ adhoc_input(struct ieee80211_node *ni, s
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int hdrspace, need_tap;
+	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */	
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	uint16_t rxseq;
@@ -318,7 +318,6 @@ adhoc_input(struct ieee80211_node *ni, s
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
-	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {

Modified: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c	Wed Feb  3 10:06:03 2010	(r203421)
+++ head/sys/net80211/ieee80211_hostap.c	Wed Feb  3 10:07:43 2010	(r203422)
@@ -480,7 +480,7 @@ hostap_input(struct ieee80211_node *ni, 
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int hdrspace, need_tap;
+	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	uint16_t rxseq;
@@ -505,7 +505,6 @@ hostap_input(struct ieee80211_node *ni, 
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
-	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {

Modified: head/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.h	Wed Feb  3 10:06:03 2010	(r203421)
+++ head/sys/net80211/ieee80211_ioctl.h	Wed Feb  3 10:07:43 2010	(r203422)
@@ -334,12 +334,12 @@ enum {
 };
 
 struct ieee80211req_mesh_route {
-	uint8_t		imr_flags;
-#define	IEEE80211_MESHRT_FLAGS_VALID	0x01
-#define	IEEE80211_MESHRT_FLAGS_PROXY	0x02
 	uint8_t		imr_dest[IEEE80211_ADDR_LEN];
 	uint8_t		imr_nexthop[IEEE80211_ADDR_LEN];
 	uint16_t	imr_nhops;
+	uint8_t		imr_flags;
+#define	IEEE80211_MESHRT_FLAGS_VALID	0x01
+#define	IEEE80211_MESHRT_FLAGS_PROXY	0x02
 	uint8_t		imr_pad;
 	uint32_t	imr_metric;
 	uint32_t	imr_lifetime;

Modified: head/sys/net80211/ieee80211_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_sta.c	Wed Feb  3 10:06:03 2010	(r203421)
+++ head/sys/net80211/ieee80211_sta.c	Wed Feb  3 10:07:43 2010	(r203422)
@@ -517,7 +517,7 @@ sta_input(struct ieee80211_node *ni, str
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int hdrspace, need_tap;
+	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	uint8_t *bssid;
 	uint16_t rxseq;
@@ -542,7 +542,6 @@ sta_input(struct ieee80211_node *ni, str
 	KASSERT(ni != NULL, ("null node"));
 	ni->ni_inact = ni->ni_inact_reload;
 
-	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {

Modified: head/sys/net80211/ieee80211_wds.c
==============================================================================
--- head/sys/net80211/ieee80211_wds.c	Wed Feb  3 10:06:03 2010	(r203421)
+++ head/sys/net80211/ieee80211_wds.c	Wed Feb  3 10:07:43 2010	(r203422)
@@ -414,7 +414,7 @@ wds_input(struct ieee80211_node *ni, str
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct ether_header *eh;
-	int hdrspace, need_tap;
+	int hdrspace, need_tap = 1;	/* mbuf need to be tapped. */
 	uint8_t dir, type, subtype, qos;
 	uint16_t rxseq;
 
@@ -437,7 +437,6 @@ wds_input(struct ieee80211_node *ni, str
 
 	KASSERT(ni != NULL, ("null node"));
 
-	need_tap = 1;			/* mbuf need to be tapped. */
 	type = -1;			/* undefined */
 
 	if (m->m_pkthdr.len < sizeof(struct ieee80211_frame_min)) {