[Prism54-devel] [PATCH] nameif compatibility

[Luis R. Rodriguez]

--HywJcj55HbA57jnN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable


It's been committed, thanks.=20

	Luis


On Mon, Feb 23, 2004 at 06:05:57PM -0800, Jean Tourrilhes wrote:
> On Mon, Feb 23, 2004 at 08:49:13PM -0500, Luis R. Rodriguez wrote:
> >=20
> > What patch? 8)
> >=20
> > 	Luis
>=20
> 	Doh ! I must bee sleeping...
>=20
> 	Jean

> --- prism54-orig/islpci_dev.c	Fri Feb 20 17:53:52 2004
> +++ prism54/islpci_dev.c	Mon Feb 23 14:41:31 2004
> @@ -50,6 +50,15 @@
>  #define ISL3877_IMAGE_FILE	"isl3877"
>  #define ISL3890_IMAGE_FILE	"isl3890"
> =20
> +/* Temporary dummy MAC address to use until firmware is loaded.
> + * The idea there is that some tools (such as nameif) may query
> + * the MAC address before the netdev is 'open'. By using a valid
> + * OUI prefix, they can process the netdev properly.
> + * Of course, this is not the final/real MAC address. It doesn't
> + * matter, as you are suppose to be able to change it anytime via
> + * ndev->set_mac_address. Jean II */
> +const unsigned char	dummy_mac[6] =3D { 0x00, 0x30, 0xB4, 0x00, 0x00, 0x0=
0 };
> +
>  /***********************************************************************=
*******
>      Device Interrupt Handler
>  ************************************************************************=
******/
> @@ -705,7 +714,9 @@ islpci_setup(struct pci_dev *pdev)
>  	/* ndev->set_multicast_list =3D &islpci_set_multicast_list; */
>  	ndev->addr_len =3D ETH_ALEN;
>  	ndev->set_mac_address =3D &prism54_set_mac_address;
> -=09
> +	/* Get a non-zero dummy MAC address for nameif. Jean II */
> +	memcpy(ndev->dev_addr, dummy_mac, 6);
> +
>  #ifdef HAVE_TX_TIMEOUT
>  	ndev->watchdog_timeo =3D ISLPCI_TX_TIMEOUT;
>  	ndev->tx_timeout =3D &islpci_eth_tx_timeout;


--=20
Key fingerprint =3D 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

--HywJcj55HbA57jnN
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAOucrat1JN+IKUl4RAjhEAKCKpYN4RKr0Z+GbKbk6QsGMJsSZsACghcWg
qMc16QCNIY3cTnok0Tz/zqc=
=eRX8
-----END PGP SIGNATURE-----

--HywJcj55HbA57jnN--