From owner-svn-soc-all@FreeBSD.ORG Tue Jul 16 09:00:39 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8F7B5C9E for ; Tue, 16 Jul 2013 09:00:39 +0000 (UTC) (envelope-from ccqin@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id 66035883 for ; Tue, 16 Jul 2013 09:00:39 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6G90dfr081595 for ; Tue, 16 Jul 2013 09:00:39 GMT (envelope-from ccqin@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6G90dKc081581 for svn-soc-all@FreeBSD.org; Tue, 16 Jul 2013 09:00:39 GMT (envelope-from ccqin@FreeBSD.org) Date: Tue, 16 Jul 2013 09:00:39 GMT Message-Id: <201307160900.r6G90dKc081581@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to ccqin@FreeBSD.org using -f From: ccqin@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254831 - soc2013/ccqin/head/sys/net80211 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jul 2013 09:00:39 -0000 Author: ccqin Date: Tue Jul 16 09:00:39 2013 New Revision: 254831 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254831 Log: Add the capability of returning multi-rate to the net80211 rate control code. Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h Modified: soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h Tue Jul 16 08:54:19 2013 (r254830) +++ soc2013/ccqin/head/sys/net80211/ieee80211_ratectl.h Tue Jul 16 09:00:39 2013 (r254831) @@ -37,6 +37,25 @@ #define IEEE80211_RATECTL_TX_SUCCESS 1 #define IEEE80211_RATECTL_TX_FAILURE 0 +#define IEEE80211_RATECTL_NUM 4 + +#define IEEE80211_RATECTL_DS_FLAG 0x01 /* dual-stream rate */ +#define IEEE80211_RATECTL_CW40_FLAG 0x02 /* use HT40 */ +#define IEEE80211_RATECTL_SGI_FLAG 0x04 /* use short-GI */ +#define IEEE80211_RATECTL_HT_FLAG 0x08 /* use HT */ +#define IEEE80211_RATECTL_RTSCTS_FLAG 0x10 /* enable RTS/CTS protection */ +#define IEEE80211_RATECTL_STBC_FLAG 0x20 /* enable STBC */ +#define IEEE80211_RATECTL_TS_FLAG 0x40 /* triple-stream rate */ + +struct ieee80211_rc_series { + uint8_t rix; /* ratetable index, not rate code */ + uint8_t ratecode; /* hardware rate code */ + uint8_t tries; + uint8_t tx_power_cap; + uint16_t flags; + uint16_t max4msframelen; +}; + struct ieee80211_ratectl { const char *ir_name; int (*ir_attach)(const struct ieee80211vap *); @@ -46,6 +65,7 @@ void (*ir_node_init)(struct ieee80211_node *); void (*ir_node_deinit)(struct ieee80211_node *); int (*ir_rate)(struct ieee80211_node *, void *, uint32_t); + void (*ir_rates)(struct ieee80211_node *, struct ieee80211_rc_series *); void (*ir_tx_complete)(const struct ieee80211vap *, const struct ieee80211_node *, int, void *, void *); @@ -93,6 +113,14 @@ } static void __inline +ieee80211_ratectl_rates(struct ieee80211_node *ni, struct ieee80211_rc_series *rc) +{ + const struct ieee80211vap *vap = ni->ni_vap; + + vap->iv_rate->ir_rates(ni, rc); +} + +static void __inline ieee80211_ratectl_tx_complete(const struct ieee80211vap *vap, const struct ieee80211_node *ni, int status, void *arg1, void *arg2) {