[Zrouter-src-freebsd] [rt2860-in-ral] push by r... at ddteam.net - Hide rt2860_send_bar() under ifdef.... on 2012-03-14 00:13 GMT

[rt2860-in-ral at googlecode.com]

Revision: 7c38b1ab34a4
Author:   Aleksandr Rybalko <ray at ddteam.net>
Date:     Tue Mar 13 17:13:21 2012
Log:      Hide rt2860_send_bar() under ifdef.
Use ieee80211_send_bar() intead of rt2860_send_bar().

Suggested by:	PseudoCylon
http://code.google.com/p/rt2860-in-ral/source/detail?r=7c38b1ab34a4

Modified:
  /sys/dev/ral/rt2860.c

=======================================
--- /sys/dev/ral/rt2860.c	Tue Mar 13 14:01:39 2012
+++ /sys/dev/ral/rt2860.c	Tue Mar 13 17:13:21 2012
@@ -462,8 +462,10 @@
  	int baparamset, int batimeout, int baseqctl);
  static void rt2860_ampdu_rx_stop(struct ieee80211_node *ni,
  	struct ieee80211_rx_ampdu *rap);
+#ifdef	RT2860_SEND_BAR_WORKAROUND
  static int rt2860_send_bar(struct ieee80211_node *ni,
  	struct ieee80211_tx_ampdu *tap, ieee80211_seq seqno);
+#endif
  static void rt2860_amrr_update_iter_func(void *arg, struct ieee80211_node  
*ni);
  static void rt2860_periodic(void *arg);
  static void rt2860_tx_watchdog(void *arg);
@@ -3131,7 +3133,11 @@
  	if (status == IEEE80211_STATUS_SUCCESS) {
  		seqno = ni->ni_txseqs[tid];

+#ifdef	RT2860_SEND_BAR_WORKAROUND
  		rt2860_send_bar(ni, tap, seqno);
+#else
+		ieee80211_send_bar(ni, tap, seqno);
+#endif
  	}

  	return ret;
@@ -3239,6 +3245,7 @@
  	sc->ampdu_rx_stop(ni, rap);
  }

+#ifdef	RT2860_SEND_BAR_WORKAROUND
  /*
   * rt2860_send_bar
   */
@@ -3303,6 +3310,7 @@

  	return ret;
  }
+#endif

  /*
   * rt2860_amrr_update_iter_func