[PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Daniel Drake]

Can a bcm43xx user please test this. It uses the new txrate stuff found in
the wireless-dev tree.

Signed-off-by: Daniel Drake <dsd@gentoo.org>

Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
===================================================================
--- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -296,11 +296,14 @@ void bcm43xx_generate_txhdr(struct bcm43
 	u16 control = 0;
 	u16 wsec_rate = 0;
 	u16 encrypt_frame;
+	u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(wireless_header->frame_ctl));
+	int is_mgt = (ftype == IEEE80211_FTYPE_MGMT) != 0;
 
 	/* Now construct the TX header. */
 	memset(txhdr, 0, sizeof(*txhdr));
 
-	bitrate = bcm->softmac->txrates.default_rate;
+	bitrate = ieee80211softmac_suggest_txrate(bcm->softmac,
+		is_multicast_ether_addr(wireless_header->addr1), is_mgt);
 	ofdm_modulation = !(ieee80211_is_cck_rate(bitrate));
 	fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate);
 	fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[John W. Linville]

On Sat, May 06, 2006 at 10:16:51AM +0100, Daniel Drake wrote:
> Can a bcm43xx user please test this. It uses the new txrate stuff found in
> the wireless-dev tree.

Daniel,

Do you intend for this to be merged?  Given recent miscommunication,
I figured I should ask... :-)

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Daniel Drake]

John W. Linville wrote:
> Do you intend for this to be merged?  Given recent miscommunication,
> I figured I should ask... :-)

Nobody has tested it yet, so no, but thanks for asking.

I figure it will be easier to find testers once the base patch (softmac 
suggest txrate) has been pushed by you into 2.6.18-rc1 ;)

Daniel

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Michael Buesch]

On Friday 19 May 2006 20:44, you wrote:
> John W. Linville wrote:
> > Do you intend for this to be merged?  Given recent miscommunication,
> > I figured I should ask... :-)
> 
> Nobody has tested it yet, so no, but thanks for asking.
> 
> I figure it will be easier to find testers once the base patch (softmac 
> suggest txrate) has been pushed by you into 2.6.18-rc1 ;)

Next time, please CC the maintainers, so they don't accidentally delete
important mail. ;)
Can you resend that patch to me in private and I will see if it
is good.

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[John W. Linville]

On Fri, May 19, 2006 at 08:32:46PM +0200, Michael Buesch wrote:
> On Friday 19 May 2006 20:44, you wrote:
> > John W. Linville wrote:
> > > Do you intend for this to be merged?  Given recent miscommunication,
> > > I figured I should ask... :-)
> > 
> > Nobody has tested it yet, so no, but thanks for asking.
> > 
> > I figure it will be easier to find testers once the base patch (softmac 
> > suggest txrate) has been pushed by you into 2.6.18-rc1 ;)
> 
> Next time, please CC the maintainers, so they don't accidentally delete
> important mail. ;)
> Can you resend that patch to me in private and I will see if it
> is good.

Any more input on this patch?  Do we want it, or not?

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Michael Buesch]

On Monday 05 June 2006 20:51, John W. Linville wrote:
> On Fri, May 19, 2006 at 08:32:46PM +0200, Michael Buesch wrote:
> > On Friday 19 May 2006 20:44, you wrote:
> > > John W. Linville wrote:
> > > > Do you intend for this to be merged?  Given recent miscommunication,
> > > > I figured I should ask... :-)
> > > 
> > > Nobody has tested it yet, so no, but thanks for asking.
> > > 
> > > I figure it will be easier to find testers once the base patch (softmac 
> > > suggest txrate) has been pushed by you into 2.6.18-rc1 ;)
> > 
> > Next time, please CC the maintainers, so they don't accidentally delete
> > important mail. ;)
> > Can you resend that patch to me in private and I will see if it
> > is good.
> 
> Any more input on this patch?  Do we want it, or not?

I will test it now and send it to you afterwards.

-- 
Greetings Michael.

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[John W. Linville]

On Mon, Jun 05, 2006 at 09:15:54PM +0200, Michael Buesch wrote:
> On Monday 05 June 2006 20:51, John W. Linville wrote:
> > On Fri, May 19, 2006 at 08:32:46PM +0200, Michael Buesch wrote:
> > > On Friday 19 May 2006 20:44, you wrote:
> > > > John W. Linville wrote:
> > > > > Do you intend for this to be merged?  Given recent miscommunication,
> > > > > I figured I should ask... :-)
> > > > 
> > > > Nobody has tested it yet, so no, but thanks for asking.
> > > > 
> > > > I figure it will be easier to find testers once the base patch (softmac 
> > > > suggest txrate) has been pushed by you into 2.6.18-rc1 ;)
> > > 
> > > Next time, please CC the maintainers, so they don't accidentally delete
> > > important mail. ;)
> > > Can you resend that patch to me in private and I will see if it
> > > is good.
> > 
> > Any more input on this patch?  Do we want it, or not?
> 
> I will test it now and send it to you afterwards.

OK, I will now 'officially' forget about this patch, and wait for you
to endorse it by re-sending it to me. :-)

Thanks,

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Michael Buesch]

On Monday 05 June 2006 21:17, John W. Linville wrote:
> OK, I will now 'officially' forget about this patch, and wait for you
> to endorse it by re-sending it to me. :-)

Ok, but it depends on this patch, which does not seem to be in your tree, yet.
http://marc.theaimsgroup.com/?l=linux-netdev&m=114651996213569&q=raw

I am not sure where it went, though... .

-- 
Greetings Michael.

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[John W. Linville]

On Mon, Jun 05, 2006 at 09:28:55PM +0200, Michael Buesch wrote:
> On Monday 05 June 2006 21:17, John W. Linville wrote:
> > OK, I will now 'officially' forget about this patch, and wait for you
> > to endorse it by re-sending it to me. :-)
> 
> Ok, but it depends on this patch, which does not seem to be in your tree, yet.
> http://marc.theaimsgroup.com/?l=linux-netdev&m=114651996213569&q=raw
> 
> I am not sure where it went, though... .

That is in the 'upstream' branch (stuff queued for 2.6.18) of wireless-2.6.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[Daniel Drake]

Michael Buesch wrote:
> On Monday 05 June 2006 21:17, John W. Linville wrote:
>> OK, I will now 'officially' forget about this patch, and wait for you
>> to endorse it by re-sending it to me. :-)
> 
> Ok, but it depends on this patch, which does not seem to be in your tree, yet.
> http://marc.theaimsgroup.com/?l=linux-netdev&m=114651996213569&q=raw
> 
> I am not sure where it went, though... .

It's in the master branch.

Daniel

Re: [PATCH,RFT] bcm43xx: use softmac-suggested TX rate

[John W. Linville]

On Mon, Jun 05, 2006 at 08:48:39PM +0100, Daniel Drake wrote:
> Michael Buesch wrote:
> >On Monday 05 June 2006 21:17, John W. Linville wrote:
> >>OK, I will now 'officially' forget about this patch, and wait for you
> >>to endorse it by re-sending it to me. :-)
> >
> >Ok, but it depends on this patch, which does not seem to be in your tree, 
> >yet.
> >http://marc.theaimsgroup.com/?l=linux-netdev&m=114651996213569&q=raw
> >
> >I am not sure where it went, though... .
> 
> It's in the master branch.

There too... :-)

-- 
John W. Linville
linville@tuxdriver.com