socsvn commit: r256830 - in soc2013/ccqin/head/sys: dev/ath dev/bwi dev/bwn dev/iwn dev/ral dev/usb/wlan dev/wpi net80211

ccqin at FreeBSD.org ccqin at FreeBSD.org
Mon Sep 2 09:51:42 UTC 2013


Author: ccqin
Date: Mon Sep  2 09:51:41 2013
New Revision: 256830
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256830

Log:
  fix compile errors.
  * fix references to ieee80211_ratectl_complete() from drivers.
  * other minor errors
  

Modified:
  soc2013/ccqin/head/sys/dev/ath/if_ath.c
  soc2013/ccqin/head/sys/dev/ath/if_ath_tx.c
  soc2013/ccqin/head/sys/dev/ath/if_ath_tx_ht.c
  soc2013/ccqin/head/sys/dev/bwi/if_bwi.c
  soc2013/ccqin/head/sys/dev/bwn/if_bwn.c
  soc2013/ccqin/head/sys/dev/iwn/if_iwn.c
  soc2013/ccqin/head/sys/dev/ral/rt2560.c
  soc2013/ccqin/head/sys/dev/ral/rt2661.c
  soc2013/ccqin/head/sys/dev/ral/rt2860.c
  soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c
  soc2013/ccqin/head/sys/dev/wpi/if_wpi.c
  soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c

Modified: soc2013/ccqin/head/sys/dev/ath/if_ath.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ath/if_ath.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ath/if_ath.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -82,6 +82,8 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
+
+#include <net80211/ieee80211_ratectl.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif

Modified: soc2013/ccqin/head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ath/if_ath_tx.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ath/if_ath_tx.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -72,6 +72,8 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
+
+#include <net80211/ieee80211_ratectl.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif
@@ -4513,12 +4515,13 @@
 	    bf_first->bf_state.bfs_pktlen,
 	    bf_first->bf_state.bfs_nframes, bf_first->bf_state.bfs_nframes);
 
-	struct ieee80211_rc_info *rc_info = IEEE80211_RATECTL_INFO(bf->bf_m);
+	struct ath_tx_status ts = bf_first->bf_status.ds_txstat;
+	struct ieee80211_rc_info *rc_info = IEEE80211_RATECTL_INFO(bf_first->bf_m);
 	ieee80211_ratectl_rc_info_set(rc_info,
 			bf_first->bf_state.bfs_nframes, bf_first->bf_state.bfs_nframes,
-			bf->bf_state.bfs_pktlen,
-			ts->ts_shortretry, ts->ts_longretry,
-			ts->ts_finaltsi, ts->ts_rate);
+			bf_first->bf_state.bfs_pktlen,
+			ts.ts_shortretry, ts.ts_longretry,
+			ts.ts_finaltsi, ts.ts_rate);
 	ieee80211_ratectl_tx_complete(ni->ni_vap, ni, rc_info);
 	ATH_TX_LOCK(sc);
 	tap = ath_tx_get_tx_tid(an, tid->tid);
@@ -4910,8 +4913,8 @@
 		struct ieee80211_rc_info *rc_info = IEEE80211_RATECTL_INFO(bf->bf_m);
 		ieee80211_ratectl_rc_info_set(rc_info,
 				nframes, nbad, pktlen,
-				ts->ts_shortretry, ts->ts_longretry,
-				ts->ts_finaltsi, ts->ts_rate);
+				ts.ts_shortretry, ts.ts_longretry,
+				ts.ts_finaltsi, ts.ts_rate);
 		ieee80211_ratectl_tx_complete(ni->ni_vap, ni, rc_info);
 	}
 
@@ -5009,9 +5012,9 @@
 
 		struct ieee80211_rc_info *rc_info = IEEE80211_RATECTL_INFO(bf->bf_m);
 		ieee80211_ratectl_rc_info_set(rc_info,
-				1, (ts->ts_status == 0 ? 0 : 1), bf->bf_state.bfs_pktlen,
-				ts->ts_shortretry, ts->ts_longretry,
-				ts->ts_finaltsi, ts->ts_rate);
+				1, (ts.ts_status == 0 ? 0 : 1), bf->bf_state.bfs_pktlen,
+				ts.ts_shortretry, ts.ts_longretry,
+				ts.ts_finaltsi, ts.ts_rate);
 		ieee80211_ratectl_tx_complete(ni->ni_vap, ni, rc_info);
 	}
 	/*

Modified: soc2013/ccqin/head/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ath/if_ath_tx_ht.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ath/if_ath_tx_ht.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -64,6 +64,8 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
+
+#include <net80211/ieee80211_ratectl.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
 #include <net80211/ieee80211_superg.h>
 #endif

Modified: soc2013/ccqin/head/sys/dev/bwi/if_bwi.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/bwi/if_bwi.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/bwi/if_bwi.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -3378,9 +3378,12 @@
 			 * well so to avoid over-aggressive downshifting we
 			 * treat any number of retries as "1".
 			 */
+#if 0
 			ieee80211_ratectl_tx_complete(vap, ni,
 			    (data_txcnt > 1) ? IEEE80211_RATECTL_TX_SUCCESS :
 			        IEEE80211_RATECTL_TX_FAILURE, &acked, NULL);
+#endif
+			ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 		}
 
 		/*

Modified: soc2013/ccqin/head/sys/dev/bwn/if_bwn.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/bwn/if_bwn.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/bwn/if_bwn.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -9021,11 +9021,14 @@
 				if (meta->mt_islast) {
 					ni = meta->mt_ni;
 					vap = ni->ni_vap;
+#if 0
 					ieee80211_ratectl_tx_complete(vap, ni,
 					    status->ack ?
 					      IEEE80211_RATECTL_TX_SUCCESS :
 					      IEEE80211_RATECTL_TX_FAILURE,
 					    &retrycnt, 0);
+#endif
+					ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 					break;
 				}
 				slot = bwn_dma_nextslot(dr, slot);
@@ -9042,11 +9045,14 @@
 			}
 			ni = tp->tp_ni;
 			vap = ni->ni_vap;
+#if 0
 			ieee80211_ratectl_tx_complete(vap, ni,
 			    status->ack ?
 			      IEEE80211_RATECTL_TX_SUCCESS :
 			      IEEE80211_RATECTL_TX_FAILURE,
 			    &retrycnt, 0);
+#endif
+			ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 		}
 		bwn_pio_handle_txeof(mac, status);
 	}

Modified: soc2013/ccqin/head/sys/dev/iwn/if_iwn.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/iwn/if_iwn.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/iwn/if_iwn.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -2500,7 +2500,8 @@
 	uint64_t bitmap;
 	uint16_t ssn;
 	uint8_t tid;
-	int ackfailcnt = 0, i, lastidx, qid, *res, shift;
+	/* int failcnt = 0; */
+	int i, lastidx, qid, *res, shift;
 
 	bus_dmamap_sync(sc->rxq.data_dmat, data->map, BUS_DMASYNC_POSTREAD);
 
@@ -2564,12 +2565,18 @@
 	for (i = 0; bitmap; i++) {
 		if ((bitmap & 1) == 0) {
 			ifp->if_oerrors++;
+#if 0
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &ackfailcnt, NULL);
+#endif
+		ieee80211_ratectl_tx_complete(ni->ni_vap, ni, NULL); /* just make it compiled. qcc */	
 		} else {
 			ifp->if_opackets++;
+#if 0
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_SUCCESS, &ackfailcnt, NULL);
+#endif
+			ieee80211_ratectl_tx_complete(ni->ni_vap, ni, NULL); /* just make it compiled. qcc */
 		}
 		bitmap >>= 1;
 	}
@@ -2808,12 +2815,18 @@
 	 */
 	if (status & IWN_TX_FAIL) {
 		ifp->if_oerrors++;
+#if 0
 		ieee80211_ratectl_tx_complete(vap, ni,
 		    IEEE80211_RATECTL_TX_FAILURE, &ackfailcnt, NULL);
+#endif
+		ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 	} else {
 		ifp->if_opackets++;
+#if 0
 		ieee80211_ratectl_tx_complete(vap, ni,
 		    IEEE80211_RATECTL_TX_SUCCESS, &ackfailcnt, NULL);
+#endif
+		ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 	}
 	m_freem(m);
 	ieee80211_free_node(ni);

Modified: soc2013/ccqin/head/sys/dev/ral/rt2560.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ral/rt2560.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ral/rt2560.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -956,9 +956,13 @@
 
 			DPRINTFN(sc, 10, "%s\n", "data frame sent successfully");
 			if (data->rix != IEEE80211_FIXED_RATE_NONE)
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
+#endif
+
 			ifp->if_opackets++;
 			break;
 
@@ -968,9 +972,12 @@
 			DPRINTFN(sc, 9, "data frame sent after %u retries\n",
 			    retrycnt);
 			if (data->rix != IEEE80211_FIXED_RATE_NONE)
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
+#endif
 			ifp->if_opackets++;
 			break;
 
@@ -980,9 +987,12 @@
 			DPRINTFN(sc, 9, "data frame failed after %d retries\n",
 			    retrycnt);
 			if (data->rix != IEEE80211_FIXED_RATE_NONE)
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_FAILURE,
 				    &retrycnt, NULL);
+#endif
 			ifp->if_oerrors++;
 			break;
 

Modified: soc2013/ccqin/head/sys/dev/ral/rt2661.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ral/rt2661.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ral/rt2661.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -906,9 +906,12 @@
 			DPRINTFN(sc, 10, "data frame sent successfully after "
 			    "%d retries\n", retrycnt);
 			if (data->rix != IEEE80211_FIXED_RATE_NONE)
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_SUCCESS,
 				    &retrycnt, NULL);
+#endif
 			ifp->if_opackets++;
 			break;
 
@@ -918,9 +921,12 @@
 			DPRINTFN(sc, 9, "%s\n",
 			    "sending data frame failed (too much retries)");
 			if (data->rix != IEEE80211_FIXED_RATE_NONE)
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_FAILURE,
 				    &retrycnt, NULL);
+#endif
 			ifp->if_oerrors++;
 			break;
 

Modified: soc2013/ccqin/head/sys/dev/ral/rt2860.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/ral/rt2860.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/ral/rt2860.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -1122,11 +1122,17 @@
 				retrycnt = 1;
 			else
 				retrycnt = 0;
+			ieee80211_ratectl_tx_complete(ni->ni_vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_SUCCESS, &retrycnt, NULL);
+#endif
 		} else {
+			ieee80211_ratectl_tx_complete(ni->ni_vap, ni, NULL); /* just make it compiled. qcc */
+#if 0
 			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
 			    IEEE80211_RATECTL_TX_FAILURE, &retrycnt, NULL);
+#endif
 			ifp->if_oerrors++;
 		}
 	}

Modified: soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -668,9 +668,12 @@
 				int retrycnt =
 				    (int)(le16toh(retry->count) & 0xff);
 				
+#if 0
 				ieee80211_ratectl_tx_complete(vap, ni,
 				    IEEE80211_RATECTL_TX_FAILURE,
 				    &retrycnt, NULL);
+#endif
+				ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 				ieee80211_free_node(ni);
 			}
 			if (le16toh(retry->count) & 0x100)

Modified: soc2013/ccqin/head/sys/dev/wpi/if_wpi.c
==============================================================================
--- soc2013/ccqin/head/sys/dev/wpi/if_wpi.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/dev/wpi/if_wpi.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -1597,8 +1597,11 @@
 		DPRINTFN(WPI_DEBUG_TX, ("%d retries\n", stat->ntries));
 		retrycnt = 1;
 	}
+#if 0
 	ieee80211_ratectl_tx_complete(vap, ni, IEEE80211_RATECTL_TX_SUCCESS,
 	    &retrycnt, NULL);
+#endif
+	ieee80211_ratectl_tx_complete(vap, ni, NULL); /* just make it compiled. qcc */
 
 	/* XXX oerrors should only count errors !maxtries */
 	if ((le32toh(stat->status) & 0xff) != 1)

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -309,9 +309,6 @@
 {
 #define	RATE(_ix)	(rs->rs_rates[(_ix)] & IEEE80211_RATE_VAL)
 #define	MCS(_ix)	(rs->rs_rates[(_ix)] | IEEE80211_RATE_MCS)
-
-	struct ieee80211_amrr_node *amn = ni->ni_rctls;
-	struct ieee80211_amrr *amrr = amn->amn_amrr;
 	struct ieee80211_rc_series *rc = rc_info->iri_rc;
 	const struct ieee80211_rateset *rs = NULL;
 	const struct ieee80211_rate_table *rt = NULL;

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -164,10 +164,10 @@
 		if (IS_HT_RATE(rate)) {
 			rc[i].flags |= IEEE80211_RATECTL_FLAG_HT;
 
-			if (ieee80211_ratectl_hascap_cw40(vap, ni))
+			if (ieee80211_ratectl_hascap_cw40(ni))
 				rc[i].flags |= IEEE80211_RATECTL_FLAG_CW40;
 
-			if (ieee80211_ratectl_hascap_shortgi(vap, ni))
+			if (ieee80211_ratectl_hascap_shortgi(ni))
 				rc[i].flags |= IEEE80211_RATECTL_FLAG_SGI;
 			/*
 			 * If we have STBC TX enabled and the receiver
@@ -175,7 +175,7 @@
 			 * MCS 0-7, AND we have at least two chains enabled,
 			 * enable STBC.
 			 */
-			if (ieee80211_ratectl_hascap_stbc(vap, ni) &&
+			if (ieee80211_ratectl_hascap_stbc(ni) &&
 				(rate & IEEE80211_RATE_VAL) < 8 &&
 				HT_RC_2_STREAMS(rate) == 1)
 				rc[i].flags |= IEEE80211_RATECTL_FLAG_STBC;

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Mon Sep  2 09:17:58 2013	(r256829)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Mon Sep  2 09:51:41 2013	(r256830)
@@ -113,8 +113,7 @@
 
 static void
 none_tx_complete(const struct ieee80211vap *vap,
-    const struct ieee80211_node *ni, int ok,
-    void *arg1, void *arg2 __unused)
+    const struct ieee80211_node *ni, struct ieee80211_rc_info *rc_info)
 {
 }
 


More information about the svn-soc-all mailing list