Re: [Madwifi-devel] Compiler Error on SVN r3579

[Pavel R. <pr...@gn...>]

On Tue, 2008-04-29 at 16:50 +0800, hiwu.tw wrote:
> Hi all:
> 
> After change BuildCaps.inc, and building the madwifi driver r3579 with
> "export ATH_CAP_SUPERG_FF=0". There will be compiler-error.

This patch should fix it (compile tested only)

Index: ath/if_ath.c
===================================================================
--- ath/if_ath.c	(revision 3579)
+++ ath/if_ath.c	(working copy)
@@ -3381,16 +3381,16 @@
 #ifdef ATH_SUPERG_FF
 	unsigned int pktlen;
 	struct ieee80211com *ic = &sc->sc_ic;
+	struct ath_txq *txq = NULL;
+	int ff_flush;
+#endif
 	struct ath_node *an;
-	struct ath_txq *txq = NULL;
 	struct sk_buff* skb = NULL;
 	/* NB: NEVER free __skb, leave it alone and use original_skb instead!
 	 * IF original_skb is NULL it means the ownership was taken!
 	 * *** ALWAYS *** free any skb != __skb when cleaning up - unless it was
 	 * taken. */
 	struct sk_buff* original_skb  = __skb; /* ALWAYS FREE THIS ONE!!! */
-	int ff_flush;
-#endif
 	ieee80211_skb_track(original_skb);
 	if ((dev->flags & IFF_RUNNING) == 0 || sc->sc_invalid) {
 		DPRINTF(sc, ATH_DEBUG_XMIT,
@@ -12847,18 +12847,22 @@
 			     const char* context)
 {
 	struct ath_buf *tbf;
+#ifdef ATH_SUPERG_FF
 	char sacontext[SCANTXBUF_NAMSIZ];
+#endif
 
 	STAILQ_FOREACH(tbf, &txq->axq_q, bf_list) {
 		ath_scanbufs_found_buf_locked(sc, dd, dd_bufs_found, tbf, 
 			context);
 	}
 
+#ifdef ATH_SUPERG_FF
 	snprintf(sacontext, sizeof(sacontext), "%s staging area", context);
 	TAILQ_FOREACH(tbf, &txq->axq_stageq, bf_stagelist) {
 		ath_scanbufs_found_buf_locked(sc, dd, dd_bufs_found, tbf, 
 			sacontext);
 	}
+#endif
 }
 
 static void
@@ -12886,6 +12890,7 @@
 							tbf, context);
 		}
 
+#ifdef ATH_SUPERG_FF
 		snprintf(context, sizeof(context), "vap %s %p[" MAC_FMT 
 			 "] mcast queue staging area", 
 			 DEV_NAME(av->av_vap.iv_dev), av, 
@@ -12894,6 +12899,7 @@
 			ath_scanbufs_found_buf_locked(sc, dd, dd_bufs_found, tbf, 
 				context);
 		}
+#endif
 	}
 }
 


-- 
Regards,
Pavel Roskin