[PATCH] b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function

[Gábor Stefanik]

2010/8/22 Rafał Miłecki <zajec5 at gmail.com>:
> Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
> ---
> Gábor: please kindly, watch out for such a missing calls/sets. We may lose a
> lot of time looking for such a missing lines later.
> ---
>  drivers/net/wireless/b43/phy_n.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
> index d116229..2466c0a 100644
> --- a/drivers/net/wireless/b43/phy_n.c
> +++ b/drivers/net/wireless/b43/phy_n.c
> @@ -3092,6 +3092,8 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
>        struct b43_phy_n *nphy = phy->n;
>        u16 buf[16];
>
> +       nphy->phyrxchain = mask;
> +
>        if (0 /* FIXME clk */)
>                return;
>
> @@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
>        b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
>                        (mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
>
> -       if (mask & 0x3 != 0x3) {
> +       if ((mask & 0x3) != 0x3) {

Why is this needed? An & doesn't magically transform into an && under
any circumstances...

>                b43_phy_write(dev, B43_NPHY_HPANT_SWTHRES, 1);
>                if (dev->phy.rev >= 3) {
>                        /* TODO */
> --
> 1.7.1
>
>



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)