Date: Thu, 5 Sep 2013 02:56:58 GMT From: ccqin@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r256929 - in soc2013/ccqin/head/sys: dev/bwn dev/usb/wlan net80211 sys Message-ID: <201309050256.r852uwWA083662@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ccqin Date: Thu Sep 5 02:56:58 2013 New Revision: 256929 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256929 Log: rm mh_ccb from mbuf (we need it as a mbug_tag) and fix some "unused variable" compile error. Modified: soc2013/ccqin/head/sys/dev/bwn/if_bwn.c soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c soc2013/ccqin/head/sys/net80211/ieee80211_rssadapt.c soc2013/ccqin/head/sys/sys/mbuf.h Modified: soc2013/ccqin/head/sys/dev/bwn/if_bwn.c ============================================================================== --- soc2013/ccqin/head/sys/dev/bwn/if_bwn.c Thu Sep 5 01:13:26 2013 (r256928) +++ soc2013/ccqin/head/sys/dev/bwn/if_bwn.c Thu Sep 5 02:56:58 2013 (r256929) @@ -8992,8 +8992,9 @@ struct bwn_stats *stats = &mac->mac_stats; struct ieee80211_node *ni; struct ieee80211vap *vap; - int retrycnt = 0, slot; - + /*int retrycnt = 0, slot;*/ + int slot; + BWN_ASSERT_LOCKED(mac->mac_sc); if (status->im) Modified: soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c Thu Sep 5 01:13:26 2013 (r256928) +++ soc2013/ccqin/head/sys/dev/usb/wlan/if_zyd.c Thu Sep 5 02:56:58 2013 (r256929) @@ -665,8 +665,8 @@ */ ni = ieee80211_find_txnode(vap, retry->macaddr); if (ni != NULL) { - int retrycnt = - (int)(le16toh(retry->count) & 0xff); + /*int retrycnt = + (int)(le16toh(retry->count) & 0xff);*/ #if 0 ieee80211_ratectl_tx_complete(vap, ni, Modified: soc2013/ccqin/head/sys/net80211/ieee80211_rssadapt.c ============================================================================== --- soc2013/ccqin/head/sys/net80211/ieee80211_rssadapt.c Thu Sep 5 01:13:26 2013 (r256928) +++ soc2013/ccqin/head/sys/net80211/ieee80211_rssadapt.c Thu Sep 5 02:56:58 2013 (r256929) @@ -84,8 +84,7 @@ static void rssadapt_raise_rate(struct ieee80211_rssadapt_node *, int, int); static void rssadapt_tx_complete(const struct ieee80211vap *, - const struct ieee80211_node *, int, - void *, void *); + const struct ieee80211_node *, struct ieee80211_rc_info *); static void rssadapt_sysctlattach(struct ieee80211vap *, struct sysctl_ctx_list *, struct sysctl_oid *); @@ -311,10 +310,11 @@ static void rssadapt_tx_complete(const struct ieee80211vap *vap, - const struct ieee80211_node *ni, int success, void *arg1, void *arg2) + const struct ieee80211_node *ni, struct ieee80211_rc_info *rc_info) { struct ieee80211_rssadapt_node *ra = ni->ni_rctls; - int pktlen = *(int *)arg1, rssi = *(int *)arg2; + /*int pktlen = *(int *)arg1, rssi = *(int *)arg2;*/ + int pktlen = 0, rssi = 0, success = 0; /* just make it compiled. qcc */ if (success) { ra->ra_nok++; Modified: soc2013/ccqin/head/sys/sys/mbuf.h ============================================================================== --- soc2013/ccqin/head/sys/sys/mbuf.h Thu Sep 5 01:13:26 2013 (r256928) +++ soc2013/ccqin/head/sys/sys/mbuf.h Thu Sep 5 02:56:58 2013 (r256929) @@ -95,7 +95,6 @@ caddr_t mh_data; /* location of data */ int mh_len; /* amount of data in this mbuf */ int mh_flags; /* flags; see below */ - uint8_t mh_ccb[48]; /* common control block */ short mh_type; /* type of data in this mbuf */ uint8_t pad[M_HDR_PAD];/* word align */ }; @@ -174,7 +173,6 @@ #define m_type m_hdr.mh_type #define m_flags m_hdr.mh_flags #define m_nextpkt m_hdr.mh_nextpkt -#define m_ccb m_hdr.mh_ccb #define m_act m_nextpkt #define m_pkthdr M_dat.MH.MH_pkthdr #define m_ext M_dat.MH.MH_dat.MH_ext
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309050256.r852uwWA083662>