svn commit: r215289 - head/sys/net80211

Bernhard Schmidt bschmidt at FreeBSD.org
Sun Nov 14 09:59:52 UTC 2010


Author: bschmidt
Date: Sun Nov 14 09:59:52 2010
New Revision: 215289
URL: http://svn.freebsd.org/changeset/base/215289

Log:
  The ni_rctls checks are used to verify that a ratectl algo has set up
  its internal data. This has been used to bypass missing calls in drivers
  which do not use the ratectl framework correctly. Issue is, not all algos
  use that variable, or even have internal data, therefore valid calls are
  not done. Fix this by removing the checks, all driver issues should be
  resolved.
  
  MFC after:	1 week

Modified:
  head/sys/net80211/ieee80211_ratectl.h

Modified: head/sys/net80211/ieee80211_ratectl.h
==============================================================================
--- head/sys/net80211/ieee80211_ratectl.h	Sun Nov 14 09:33:47 2010	(r215288)
+++ head/sys/net80211/ieee80211_ratectl.h	Sun Nov 14 09:59:52 2010	(r215289)
@@ -81,8 +81,6 @@ ieee80211_ratectl_node_deinit(struct iee
 {
 	const struct ieee80211vap *vap = ni->ni_vap;
 
-	if (ni->ni_rctls == NULL)	/* ratectl not setup */
-		return;
 	vap->iv_rate->ir_node_deinit(ni);
 }
 
@@ -91,8 +89,6 @@ ieee80211_ratectl_rate(struct ieee80211_
 {
 	const struct ieee80211vap *vap = ni->ni_vap;
 
-	if (ni->ni_rctls == NULL)	/* ratectl not setup */
-		return 0;
 	return vap->iv_rate->ir_rate(ni, arg, iarg);
 }
 
@@ -100,8 +96,6 @@ static void __inline
 ieee80211_ratectl_tx_complete(const struct ieee80211vap *vap,
     const struct ieee80211_node *ni, int status, void *arg1, void *arg2)
 {
-	if (ni->ni_rctls == NULL)	/* ratectl not setup */
-		return;
 	vap->iv_rate->ir_tx_complete(vap, ni, status, arg1, arg2);
 }
 
@@ -111,8 +105,6 @@ ieee80211_ratectl_tx_update(const struct
 {
 	if (vap->iv_rate->ir_tx_update == NULL)
 		return;
-	if (ni->ni_rctls == NULL)	/* ratectl not setup */
-		return;
 	vap->iv_rate->ir_tx_update(vap, ni, arg1, arg2, arg3);
 }
 


More information about the svn-src-head mailing list