Attachment 156478 Details for Bug 200034 – Remove ieee80211_ack_rate() / unused ackrate variables

[patch] Remove ieee80211_ack_rate() / unused ackrate variables

patch-ack-rate.diff (text/plain), 4.47 KB, created by Andriy Voskoboinyk on 2015-05-07 20:05:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-05-07 20:05:52 UTC

Size: 4.47 KB

patch

obsolete

>Index: sys/net80211/ieee80211_phy.h
>===================================================================
>--- sys/net80211/ieee80211_phy.h	(revision 282543)
>+++ sys/net80211/ieee80211_phy.h	(working copy)
>@@ -83,21 +83,6 @@
> 			struct ieee80211_channel *);
> 
> static __inline__ uint8_t
>-ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate)
>-{
>-	/*
>-	 * XXX Assert this is for a legacy rate; not for an MCS rate.
>-	 * If the caller wishes to use it for a basic rate, they should
>-	 * clear the high bit first.
>-	 */
>-	KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
>-
>-	uint8_t cix = rt->info[rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]].ctlRateIndex;
>-	KASSERT(cix != (uint8_t)-1, ("rate %d has no info", rate));
>-	return rt->info[cix].dot11Rate;
>-}
>-
>-static __inline__ uint8_t
> ieee80211_ctl_rate(const struct ieee80211_rate_table *rt, uint8_t rate)
> {
> 	/*
>Index: sys/dev/ral/rt2560.c
>===================================================================
>--- sys/dev/ral/rt2560.c	(revision 282543)
>+++ sys/dev/ral/rt2560.c	(working copy)
>@@ -1634,7 +1634,7 @@
> 	struct rt2560_tx_desc *desc;
> 	struct rt2560_tx_data *data;
> 	struct mbuf *mprot;
>-	int protrate, ackrate, pktlen, flags, isshort, error;
>+	int protrate, pktlen, flags, isshort, error;
> 	uint16_t dur;
> 	bus_dma_segment_t segs[RT2560_MAX_SCATTER];
> 	int nsegs;
>@@ -1646,7 +1646,6 @@
> 	pktlen = m->m_pkthdr.len + IEEE80211_CRC_LEN;
> 
> 	protrate = ieee80211_ctl_rate(ic->ic_rt, rate);
>-	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
> 
> 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
> 	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
>Index: sys/dev/ral/rt2661.c
>===================================================================
>--- sys/dev/ral/rt2661.c	(revision 282543)
>+++ sys/dev/ral/rt2661.c	(working copy)
>@@ -1394,7 +1394,7 @@
> 	struct rt2661_tx_desc *desc;
> 	struct rt2661_tx_data *data;
> 	struct mbuf *mprot;
>-	int protrate, ackrate, pktlen, flags, isshort, error;
>+	int protrate, pktlen, flags, isshort, error;
> 	uint16_t dur;
> 	bus_dma_segment_t segs[RT2661_MAX_SCATTER];
> 	int nsegs;
>@@ -1406,7 +1406,6 @@
> 	pktlen = m->m_pkthdr.len + IEEE80211_CRC_LEN;
> 
> 	protrate = ieee80211_ctl_rate(ic->ic_rt, rate);
>-	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
> 
> 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
> 	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
>Index: sys/dev/usb/wlan/if_rum.c
>===================================================================
>--- sys/dev/usb/wlan/if_rum.c	(revision 282543)
>+++ sys/dev/usb/wlan/if_rum.c	(working copy)
>@@ -1059,7 +1061,7 @@
> 	const struct ieee80211_frame *wh;
> 	struct rum_tx_data *data;
> 	struct mbuf *mprot;
>-	int protrate, ackrate, pktlen, flags, isshort;
>+	int protrate, pktlen, flags, isshort;
> 	uint16_t dur;
> 
> 	RUM_LOCK_ASSERT(sc, MA_OWNED);
>@@ -1070,7 +1072,6 @@
> 	pktlen = m->m_pkthdr.len + IEEE80211_CRC_LEN;
> 
> 	protrate = ieee80211_ctl_rate(ic->ic_rt, rate);
>-	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
> 
> 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
> 	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
>Index: sys/dev/usb/wlan/if_run.c
>===================================================================
>--- sys/dev/usb/wlan/if_run.c	(revision 282543)
>+++ sys/dev/usb/wlan/if_run.c	(working copy)
>@@ -3527,7 +3527,6 @@
> 	struct mbuf *mprot;
> 	int ridx;
> 	int protrate;
>-	int ackrate;
> 	int pktlen;
> 	int isshort;
> 	uint16_t dur;
>@@ -3545,7 +3544,6 @@
> 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
> 
> 	protrate = ieee80211_ctl_rate(ic->ic_rt, rate);
>-	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
> 
> 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
> 	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
>Index: sys/dev/usb/wlan/if_ural.c
>===================================================================
>--- sys/dev/usb/wlan/if_ural.c	(revision 282543)
>+++ sys/dev/usb/wlan/if_ural.c	(working copy)
>@@ -1170,7 +1170,7 @@
> 	const struct ieee80211_frame *wh;
> 	struct ural_tx_data *data;
> 	struct mbuf *mprot;
>-	int protrate, ackrate, pktlen, flags, isshort;
>+	int protrate, pktlen, flags, isshort;
> 	uint16_t dur;
> 
> 	KASSERT(prot == IEEE80211_PROT_RTSCTS || prot == IEEE80211_PROT_CTSONLY,
>@@ -1180,7 +1180,6 @@
> 	pktlen = m->m_pkthdr.len + IEEE80211_CRC_LEN;
> 
> 	protrate = ieee80211_ctl_rate(ic->ic_rt, rate);
>-	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
> 
> 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
> 	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)

Actions: View | Diff

Attachments on bug 200034: 156478