linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ssb: Fix compilation errors in ssb
@ 2007-11-16  6:48 Larry Finger
  2007-11-16 10:30 ` Michael Buesch
  0 siblings, 1 reply; 5+ messages in thread
From: Larry Finger @ 2007-11-16  6:48 UTC (permalink / raw)
  To: John Linville; +Cc: Michael Buesch, Bcm43xx-dev, linux-wireless

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 */

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-11-16 21:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-16  6:48 [PATCH] ssb: Fix compilation errors in ssb Larry Finger
2007-11-16 10:30 ` Michael Buesch
2007-11-16 14:21   ` Larry Finger
2007-11-16 14:56     ` John W. Linville
2007-11-16 21:53       ` Michael Buesch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).