2013-04-13 00:12:03

by Rafał Miłecki

[permalink] [raw]
Subject: pull request: b43-next 2013-04-13

John,

I wanted to ask you for pulling b43 changes queued for 3.10. They are all
sitting in my git repo at infradead I've announced a few weeks ago.

Changes include:
1) Minor improvements for HT-PHY code (BCM4331)
2) Code cleaning for HT-PHY and N-PHY
They are mostly coming from me, but I've also included Hauke's minor cleanup.

All patches were posted (and I believe all of them reviewed) on b43-dev ML.

I've used various hardware to cover and test all code paths that has been
touched. That included BCM4321, BCM4322 and BCM43224. No regressions spotted.
I've also built b43 for my Broadcom SoC based router to test HT-PHY code on
BCM4331.

Please let me know if that looks OK and if you can pull this tree, or if there
are any problems.


The following changes since commit 9cc04d692c031bf2113338b03974511670ac5cc9:

Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
(2013-03-27 17:33:52 -0400)

are available in the git repository at:


git://git.infradead.org/users/rafal/b43-next.git master

for you to fetch changes up to adca58e2b4f350e9a93ca6c953be3f8e76ed541e:

b43: N-PHY: don't use deprecated b43_radio_foo16 (2013-04-13 01:32:48 +0200)

----------------------------------------------------------------
Hauke Mehrtens (1):
b43: N-PHY: use bcma_pmu_spuravoid_pllupdate()

Rafał Miłecki (21):
b43: HT-PHY: rename defines addressing cores on the 2059 radio
b43: HT-PHY: tables: don't duplicate core-generic regs
b43: HT-PHY: finish calculating values for idle TSSI
b43: HT-PHY: do some extra TSSI setup after configuring TX
b43: HT-PHY: define regs for power estimation
b43: HT-PHY: store TX power state before disabling it
b43: HT-PHY: use enum for RSSI types
b43: N-PHY: use enum for RAIL type
b43: N-PHY: simplify conditions in RSSI offset scale function
b43: N-PHY: use more friendly variables names in RSSI code
b43: N-PHY: rename RSSI types to be shorter and more accurate
b43: N-PHY: use enum for RSSI type everywhere we use it
b43: N-PHY: fix "NB" RSSI calibration on PHYs rev2-
b43: use defines for board_type
b43: N-PHY: define missing registers
b43: N-PHY: use enum for INTC override function argument
b43: N-PHY: use shortcut "ctl" in functions names
b43: N-PHY: use defines for (re)storing VCM config
b43: N-PHY: move tables init function to tables file
b43: N-PHY: clean init tables
b43: N-PHY: don't use deprecated b43_radio_foo16

drivers/net/wireless/b43/phy_ht.c | 119 ++++--
drivers/net/wireless/b43/phy_ht.h | 6 +
drivers/net/wireless/b43/phy_lp.c | 4 +-
drivers/net/wireless/b43/phy_n.c | 705 ++++++++++++++++----------------
drivers/net/wireless/b43/phy_n.h | 146 +++++++
drivers/net/wireless/b43/radio_2059.c | 39 +-
drivers/net/wireless/b43/radio_2059.h | 14 +-
drivers/net/wireless/b43/tables_nphy.c | 97 +++--
drivers/net/wireless/b43/tables_nphy.h | 29 +-
9 files changed, 663 insertions(+), 496 deletions(-)


2013-04-22 18:59:25

by John W. Linville

[permalink] [raw]
Subject: Re: pull request: b43-next 2013-04-13

On Sat, Apr 13, 2013 at 02:12:02AM +0200, Rafał Miłecki wrote:
> John,
>
> I wanted to ask you for pulling b43 changes queued for 3.10. They are all
> sitting in my git repo at infradead I've announced a few weeks ago.
>
> Changes include:
> 1) Minor improvements for HT-PHY code (BCM4331)
> 2) Code cleaning for HT-PHY and N-PHY
> They are mostly coming from me, but I've also included Hauke's minor cleanup.
>
> All patches were posted (and I believe all of them reviewed) on b43-dev ML.
>
> I've used various hardware to cover and test all code paths that has been
> touched. That included BCM4321, BCM4322 and BCM43224. No regressions spotted.
> I've also built b43 for my Broadcom SoC based router to test HT-PHY code on
> BCM4331.
>
> Please let me know if that looks OK and if you can pull this tree, or if there
> are any problems.
>
>
> The following changes since commit 9cc04d692c031bf2113338b03974511670ac5cc9:
>
> Merge branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
> (2013-03-27 17:33:52 -0400)
>
> are available in the git repository at:
>
>
> git://git.infradead.org/users/rafal/b43-next.git master
>
> for you to fetch changes up to adca58e2b4f350e9a93ca6c953be3f8e76ed541e:
>
> b43: N-PHY: don't use deprecated b43_radio_foo16 (2013-04-13 01:32:48 +0200)

When I pull this, I get a bunch of non-b43 (even non-wireless) crap.
My guess is that your tree is not based off wireless-next.

If you want me to pull from your tree, then it needs to be based off
wireless-next (or possible some ancestor tree) so that all I pull
from you is your specific changes.

With time running short before the 3.10 merge window, perhaps you
should resend this batch as a series of patches? We can work more
on pull requests after the merge window?

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.