2009-07-01 03:39:32

by Larry Finger

Subject: [PATCH V2] ssb: Add support for 4318E

From: Clyde McPherson <[email protected]>

Added support for the Broadcom 4318E chipset on PCMCIA/CF cards. The
4318E can do 802.11A/B/G, only B and G mode are supported in b43.

Signed-off-by: Clyde McPherson <[email protected]>
Signed-off-by: Larry Finger <[email protected]>
---

Index: wireless-testing/drivers/ssb/pcmcia.c
===================================================================
--- wireless-testing.orig/drivers/ssb/pcmcia.c
+++ wireless-testing/drivers/ssb/pcmcia.c
@@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb
sprom->board_rev = tuple.TupleData[1];
break;
case SSB_PCMCIA_CIS_PA:
- GOTO_ERROR_ON(tuple.TupleDataLen != 9,
+ GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
+ (tuple.TupleDataLen != 10),
"pa tpl size");
sprom->pa0b0 = tuple.TupleData[1] |
((u16)tuple.TupleData[2] << 8);
@@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb
sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
break;
case SSB_PCMCIA_CIS_BFLAGS:
- GOTO_ERROR_ON(tuple.TupleDataLen != 3,
+ GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
+ (tuple.TupleDataLen != 5),
"bfl tpl size");
sprom->boardflags_lo = tuple.TupleData[1] |
((u16)tuple.TupleData[2] << 8);

2009-07-01 18:18:39

by Michael Büsch

Subject: Re: [PATCH V2] ssb: Add support for 4318E

On Wednesday 01 July 2009 17:28:43 Larry Finger wrote:
> Michael Buesch wrote:
> > On Wednesday 01 July 2009 05:39:43 Larry Finger wrote:
> >> From: Clyde McPherson <[email protected]>
> >>
> >> Added support for the Broadcom 4318E chipset on PCMCIA/CF cards. The
> >> 4318E can do 802.11A/B/G, only B and G mode are supported in b43.
> >>
> >> Signed-off-by: Clyde McPherson <[email protected]>
> >> Signed-off-by: Larry Finger <[email protected]>
> >
> > ack
> >
>
> Cc: Stable <[email protected]>

I do not think these patches are subject to -stable.

--
Greetings, Michael.

2009-07-01 15:28:32

by Larry Finger

Subject: Re: [PATCH V2] ssb: Add support for 4318E

Michael Buesch wrote:
> On Wednesday 01 July 2009 05:39:43 Larry Finger wrote:
>> From: Clyde McPherson <[email protected]>
>>
>> Added support for the Broadcom 4318E chipset on PCMCIA/CF cards. The
>> 4318E can do 802.11A/B/G, only B and G mode are supported in b43.
>>
>> Signed-off-by: Clyde McPherson <[email protected]>
>> Signed-off-by: Larry Finger <[email protected]>
>
> ack
>

Cc: Stable <[email protected]>

John,

I forgot the above line in both the b43 and ssb patches.

Larry

2009-07-01 13:17:36

by Michael Büsch

Subject: Re: [PATCH V2] ssb: Add support for 4318E

On Wednesday 01 July 2009 05:39:43 Larry Finger wrote:
> From: Clyde McPherson <[email protected]>
>
> Added support for the Broadcom 4318E chipset on PCMCIA/CF cards. The
> 4318E can do 802.11A/B/G, only B and G mode are supported in b43.
>
> Signed-off-by: Clyde McPherson <[email protected]>
> Signed-off-by: Larry Finger <[email protected]>

ack

> ---
>
> Index: wireless-testing/drivers/ssb/pcmcia.c
> ===================================================================
> --- wireless-testing.orig/drivers/ssb/pcmcia.c
> +++ wireless-testing/drivers/ssb/pcmcia.c
> @@ -678,7 +678,8 @@ int ssb_pcmcia_get_invariants(struct ssb
> sprom->board_rev = tuple.TupleData[1];
> break;
> case SSB_PCMCIA_CIS_PA:
> - GOTO_ERROR_ON(tuple.TupleDataLen != 9,
> + GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
> + (tuple.TupleDataLen != 10),
> "pa tpl size");
> sprom->pa0b0 = tuple.TupleData[1] |
> ((u16)tuple.TupleData[2] << 8);
> @@ -718,7 +719,8 @@ int ssb_pcmcia_get_invariants(struct ssb
> sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
> break;
> case SSB_PCMCIA_CIS_BFLAGS:
> - GOTO_ERROR_ON(tuple.TupleDataLen != 3,
> + GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
> + (tuple.TupleDataLen != 5),
> "bfl tpl size");
> sprom->boardflags_lo = tuple.TupleData[1] |
> ((u16)tuple.TupleData[2] << 8);
>
>



--
Greetings, Michael.