[PATCH] ssb: Fix compilation errors in ssb

[PATCH] ssb: Fix compilation errors in ssb

[Larry Finger]

Recent changes in ssb sprom handling break compilation. These two patches
fix the problem.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

John,

These two changes should be applied to the everything branch of wireless-2.6
ASAP. Sorry about the mixup - I have no idea what happened.

Larry

Index: wireless-2.6/drivers/ssb/pci.c
===================================================================
--- wireless-2.6.orig/drivers/ssb/pci.c
+++ wireless-2.6/drivers/ssb/pci.c
@@ -415,7 +415,7 @@ static int sprom_extract(struct ssb_bus 
 		if (out->revision == 0)
 			goto unsupported;
 		if (out->revision >= 1 && out->revision <= 3) {
-			sprom_extract_r123(out, in, out->revision);
+			sprom_extract_r123(out, in);
 		}
 		if (out->revision == 4)
 			sprom_extract_r4(out, in);
Index: wireless-2.6/include/linux/ssb/ssb.h
===================================================================
--- wireless-2.6.orig/include/linux/ssb/ssb.h
+++ wireless-2.6/include/linux/ssb/ssb.h
@@ -16,6 +16,7 @@ struct ssb_bus;
 struct ssb_driver;
 
 struct ssb_sprom {
+	u8 revision;
 	u8 il0mac[6];		/* MAC address for 802.11b/g */
 	u8 et0mac[6];		/* MAC address for Ethernet */
 	u8 et1mac[6];		/* MAC address for 802.11a */

Re: [PATCH] ssb: Fix compilation errors in ssb

[Michael Buesch]

On Friday 16 November 2007 07:48:23 Larry Finger wrote:
> Recent changes in ssb sprom handling break compilation. These two patches
> fix the problem.
> 
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> ---
> 
> John,
> 
> These two changes should be applied to the everything branch of wireless-2.6
> ASAP. Sorry about the mixup - I have no idea what happened.

are your sprom r4 changes already applied? I didn't test that in the b44, yet.

-- 
Greetings Michael.

Re: [PATCH] ssb: Fix compilation errors in ssb

[Larry Finger]

Michael Buesch wrote:
> On Friday 16 November 2007 07:48:23 Larry Finger wrote:
>> Recent changes in ssb sprom handling break compilation. These two patches
>> fix the problem.
>>
>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>> ---
>>
>> John,
>>
>> These two changes should be applied to the everything branch of wireless-2.6
>> ASAP. Sorry about the mixup - I have no idea what happened.
> 
> are your sprom r4 changes already applied? I didn't test that in the b44, yet.

I did a git pull yesterday and the sprom r3 and r4 changes were in wireless-2.6/everything.

Larry

Re: [PATCH] ssb: Fix compilation errors in ssb

[John W. Linville]

On Fri, Nov 16, 2007 at 08:21:43AM -0600, Larry Finger wrote:
> Michael Buesch wrote:
> > On Friday 16 November 2007 07:48:23 Larry Finger wrote:
> >> Recent changes in ssb sprom handling break compilation. These two patches
> >> fix the problem.

> > are your sprom r4 changes already applied? I didn't test that in the b44, yet.
> 
> I did a git pull yesterday and the sprom r3 and r4 changes were in wireless-2.6/everything.

And now, so is this one.  I'll probably roll it into the main ssb
sprom patch before actually sending it to Jeff.

Thanks,

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

Re: [PATCH] ssb: Fix compilation errors in ssb

[Michael Buesch]

On Friday 16 November 2007 15:56:32 John W. Linville wrote:
> On Fri, Nov 16, 2007 at 08:21:43AM -0600, Larry Finger wrote:
> > Michael Buesch wrote:
> > > On Friday 16 November 2007 07:48:23 Larry Finger wrote:
> > >> Recent changes in ssb sprom handling break compilation. These two patches
> > >> fix the problem.
> 
> > > are your sprom r4 changes already applied? I didn't test that in the b44, yet.
> > 
> > I did a git pull yesterday and the sprom r3 and r4 changes were in wireless-2.6/everything.
> 
> And now, so is this one.  I'll probably roll it into the main ssb
> sprom patch before actually sending it to Jeff.

Ok, cool.

-- 
Greetings Michael.