socsvn commit: r255970 - soc2013/ccqin/head/sys/net80211

[ccqin at FreeBSD.org]

Author: ccqin
Date: Thu Aug 15 10:18:36 2013
New Revision: 255970
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255970

Log:
  fix some errors.
  

Modified:
  soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h
  soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c	Thu Aug 15 09:07:05 2013	(r255969)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_amrr.c	Thu Aug 15 10:18:36 2013	(r255970)
@@ -129,17 +129,6 @@
 	free(vap->iv_rs, M_80211_RATECTL);
 }
 
-static int
-ieee80211_ratectl_node_is11n(struct ieee80211_node *ni)
-{
-
-	if (ni->ni_chan == NULL)
-		return (0);
-	if (ni->ni_chan == IEEE80211_CHAN_ANYC)
-		return (0);
-	return (IEEE80211_IS_CHAN_HT(ni->ni_chan));
-}
-
 static void
 amrr_node_init(struct ieee80211_node *ni, uint32_t capabilities)
 {

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c	Thu Aug 15 09:07:05 2013	(r255969)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.c	Thu Aug 15 10:18:36 2013	(r255970)
@@ -124,9 +124,8 @@
 		struct ieee80211_rc_info *rc_info)
 {
 	const struct ieee80211_rate_table * rt = NULL;
-	const struct ieee80211com *ic = ni->ni_ic;
 	struct ieee80211_rc_series *rc = rc_info->ri_rc;
-	int shortPreamble = rc_info->ri_shortPreamble;
+	/* int shortPreamble = rc_info->ri_shortPreamble; */
 	uint8_t rate;
 	int i;
 

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h	Thu Aug 15 09:07:05 2013	(r255969)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h	Thu Aug 15 10:18:36 2013	(r255970)
@@ -251,7 +251,7 @@
 	return (IEEE80211_IS_CHAN_HT(ni->ni_chan));
 }
 
-static const struct ieee80211_rateset * __inline
+__inline static const struct ieee80211_rateset *
 ieee80211_ratectl_get_rateset(const struct ieee80211_node *ni)
 {
 	return ieee80211_ratectl_node_is11n(ni) ? 

Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c
==============================================================================
--- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Thu Aug 15 09:07:05 2013	(r255969)
+++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl_none.c	Thu Aug 15 10:18:36 2013	(r255970)
@@ -57,7 +57,7 @@
 }
 
 static void
-none_node_init(struct ieee80211_node *ni)
+none_node_init(struct ieee80211_node *ni, uint32_t capabilities)
 {
 	ni->ni_txrate = ni->ni_rates.rs_rates[0] & IEEE80211_RATE_VAL;
 }