W dniu 6 paÅdziernika 2010 17:30 uÅytkownik Michael BÃsch
<mb@xxxxxxxxx> napisaÅ:
> On Wed, 2010-10-06 at 07:50 +0200, RafaÅ MiÅecki wrote:
>> It's already set in PHY common code.
>>
>> Signed-off-by: RafaÅ MiÅecki <zajec5@xxxxxxxxx>
>> ---
>> Âdrivers/net/wireless/b43/phy_n.c | Â 13 +++----------
>> Â1 files changed, 3 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
>> index 47c58cd..bb8cb36 100644
>> --- a/drivers/net/wireless/b43/phy_n.c
>> +++ b/drivers/net/wireless/b43/phy_n.c
>> @@ -73,8 +73,6 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u16 value, u8 core, bool off);
>> Âstatic void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
>> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u16 value, u8 core);
>> -static int b43_nphy_op_switch_channel(struct b43_wldev *dev,
>> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â unsigned int new_channel);
>>
>> Âstatic inline bool b43_empty_chanspec(struct b43_chanspec *chanspec)
>> Â{
>> @@ -224,7 +222,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
>> Â Â Â if (i)
>> Â Â Â Â Â Â Â b43err(dev->wl, "radio post init timeout\n");
>> Â Â Â b43_radio_mask(dev, B2055_CAL_LPOCTL, 0xFF7F);
>> - Â Â b43_nphy_op_switch_channel(dev, dev->phy.channel);
>> + Â Â b43_switch_channel(dev, dev->phy.channel);
>> Â Â Â b43_radio_write(dev, B2055_C1_RX_BB_LPF, 0x9);
>> Â Â Â b43_radio_write(dev, B2055_C2_RX_BB_LPF, 0x9);
>> Â Â Â b43_radio_write(dev, B2055_C1_RX_BB_MIDACHP, 0x83);
>> @@ -3352,12 +3350,7 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,
>>
>> Â Â Â b43_chantab_phy_upload(dev, e);
>>
>> - Â Â tmp = chanspec.channel;
>> - Â Â if (chanspec.b_freq == 1)
>> - Â Â Â Â Â Â tmp |= 0x0100;
>> - Â Â if (chanspec.b_width == 3)
>> - Â Â Â Â Â Â tmp |= 0x0200;
>> - Â Â b43_shm_write16(dev, B43_SHM_SHARED, 0xA0, tmp);
>> + Â Â /* Don't follow specs, B43_SHM_SH_CHAN is set by b43_switch_channel */
>
> Looks great. I dunno if a comment is really needed and whether it is
> correct, though. We _do_ follow the specs. We just do it elsewhere.
I got "Don't strictly follow specs here" earlier, but made it shorter
to match 80 chars ;) Maybe it wasn't too good idea. Should left it
longer or don't put at all.
John: could you drop this comment line when applying? Or would you
like me to resend this fixed?
--
RafaÅ
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
