netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] bcm43xx-d80211: check for valid MAC address in SPROM
@ 2006-05-05 19:55 Stefano Brivio
  2006-05-05 19:59 ` [PATCH 3/3] bcm43xx-d80211: add PCI ID for bcm4319 Stefano Brivio
  2006-05-05 19:59 ` [PATCH 2/3] bcm43xx-d80211: fix whitespace Stefano Brivio
  0 siblings, 2 replies; 4+ messages in thread
From: Stefano Brivio @ 2006-05-05 19:55 UTC (permalink / raw)
  To: John W. Linville; +Cc: bcm43xx-dev, netdev

Please apply to wireless-dev.

--

Check for valid MAC address in SPROM fields instead of relying on PHY type
while setting the MAC address in the networking subsystem, as some devices
have multiple PHYs.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>

Index: wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 00:50:00.370034536 +0200
+++ wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 02:43:44.981535888 +0200
@@ -3482,7 +3482,7 @@
 	bcm43xx_pctl_set_crystal(bcm, 0);
 
 	/* Set the MAC address in the networking subsystem */
-	if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A)
+	if (is_valid_ether_addr(bcm->sprom.et1macaddr))
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.et1macaddr, 6);
 	else
 		memcpy(bcm->net_dev->dev_addr, bcm->sprom.il0macaddr, 6);


--
Ciao
Stefano

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

* [PATCH 3/3] bcm43xx-d80211: add PCI ID for bcm4319
  2006-05-05 19:55 [PATCH 1/3] bcm43xx-d80211: check for valid MAC address in SPROM Stefano Brivio
@ 2006-05-05 19:59 ` Stefano Brivio
  2006-05-05 19:59 ` [PATCH 2/3] bcm43xx-d80211: fix whitespace Stefano Brivio
  1 sibling, 0 replies; 4+ messages in thread
From: Stefano Brivio @ 2006-05-05 19:59 UTC (permalink / raw)
  To: John W. Linville; +Cc: bcm43xx-dev, netdev

Add PCI ID for bcm4319.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>

Index: wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 00:50:00.370034536 +0200
+++ wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 02:56:42.216378232 +0200
@@ -132,6 +132,8 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for
 	{ PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 		/* Broadcom 4318 802.11b/g */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+	/* Broadcom 4319 802.11b/g */
+	{ PCI_VENDOR_ID_BROADCOM, 0x4319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	/* Broadcom 4306 802.11b/g */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 		/* Broadcom 4306 802.11a */


--
Ciao
Stefano

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

* [PATCH 2/3] bcm43xx-d80211: fix whitespace
  2006-05-05 19:55 [PATCH 1/3] bcm43xx-d80211: check for valid MAC address in SPROM Stefano Brivio
  2006-05-05 19:59 ` [PATCH 3/3] bcm43xx-d80211: add PCI ID for bcm4319 Stefano Brivio
@ 2006-05-05 19:59 ` Stefano Brivio
  2006-05-06 17:43   ` Michael Buesch
  1 sibling, 1 reply; 4+ messages in thread
From: Stefano Brivio @ 2006-05-05 19:59 UTC (permalink / raw)
  To: John W. Linville; +Cc: bcm43xx-dev, netdev

Fix whitespace.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>

Index: wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 00:50:00.370034536 +0200
+++ wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 02:43:44.981535888 +0200
@@ -128,13 +128,13 @@
 	static struct pci_device_id bcm43xx_pci_tbl[] = {
 	/* Broadcom 4303 802.11b */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-		/* Broadcom 4307 802.11b */
+	/* Broadcom 4307 802.11b */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-		/* Broadcom 4318 802.11b/g */
+	/* Broadcom 4318 802.11b/g */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	/* Broadcom 4306 802.11b/g */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-		/* Broadcom 4306 802.11a */
+	/* Broadcom 4306 802.11a */
 //	{ PCI_VENDOR_ID_BROADCOM, 0x4321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
 	/* Broadcom 4309 802.11a/b/g */
 	{ PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },


--
Ciao
Stefano

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

* Re: [PATCH 2/3] bcm43xx-d80211: fix whitespace
  2006-05-05 19:59 ` [PATCH 2/3] bcm43xx-d80211: fix whitespace Stefano Brivio
@ 2006-05-06 17:43   ` Michael Buesch
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Buesch @ 2006-05-06 17:43 UTC (permalink / raw)
  To: Stefano Brivio; +Cc: bcm43xx-dev, netdev, John W. Linville

On Friday 05 May 2006 21:59, Stefano Brivio wrote:
> Fix whitespace.
> 
> Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
> 
> Index: wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> ===================================================================
> --- wireless-dev.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 00:50:00.370034536 +0200
> +++ wireless-dev/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-05-05 02:43:44.981535888 +0200

All your d80211 patches are _not_ against the dscape port
of the bcm43xx driver. The dscape port is located at:
wireless-dev/drivers/net/wireless/d80211/bcm43xx/

> @@ -128,13 +128,13 @@
>  	static struct pci_device_id bcm43xx_pci_tbl[] = {
>  	/* Broadcom 4303 802.11b */
>  	{ PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> -		/* Broadcom 4307 802.11b */
> +	/* Broadcom 4307 802.11b */
>  	{ PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> -		/* Broadcom 4318 802.11b/g */
> +	/* Broadcom 4318 802.11b/g */
>  	{ PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
>  	/* Broadcom 4306 802.11b/g */
>  	{ PCI_VENDOR_ID_BROADCOM, 0x4320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> -		/* Broadcom 4306 802.11a */
> +	/* Broadcom 4306 802.11a */
>  //	{ PCI_VENDOR_ID_BROADCOM, 0x4321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
>  	/* Broadcom 4309 802.11a/b/g */
>  	{ PCI_VENDOR_ID_BROADCOM, 0x4324, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
> 
> 
> --
> Ciao
> Stefano
> _______________________________________________
> Bcm43xx-dev mailing list
> Bcm43xx-dev@lists.berlios.de
> http://lists.berlios.de/mailman/listinfo/bcm43xx-dev
> 

-- 
Greetings Michael.

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

end of thread, other threads:[~2006-05-06 17:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-05 19:55 [PATCH 1/3] bcm43xx-d80211: check for valid MAC address in SPROM Stefano Brivio
2006-05-05 19:59 ` [PATCH 3/3] bcm43xx-d80211: add PCI ID for bcm4319 Stefano Brivio
2006-05-05 19:59 ` [PATCH 2/3] bcm43xx-d80211: fix whitespace Stefano Brivio
2006-05-06 17:43   ` 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).