mirror of
https://github.com/Freescale/meta-freescale-3rdparty.git
synced 2025-07-19 12:09:01 +02:00
linux-imx (2.6.35.3): drop smsc95xx patch
The patch has been move to meta-fsl-arm as this is clearly a fix and ought to be shared among all boards. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
052b533895
commit
738dd658e3
|
@ -1,51 +0,0 @@
|
||||||
smsc95xx: generate random MAC address once, not every ifup
|
|
||||||
|
|
||||||
The smsc95xx driver currently generates a new random MAC address
|
|
||||||
every time the interface is brought up. This makes it impossible to
|
|
||||||
override using the standard `ifconfig hw ether` approach.
|
|
||||||
|
|
||||||
Past patches tried to make the MAC address a module parameter or
|
|
||||||
base it off the die ID, but it seems to me much simpler (and
|
|
||||||
hopefully less controversial) to stick with the current random
|
|
||||||
generation scheme, but allow the user to change the address.
|
|
||||||
|
|
||||||
This patch does exactly that - it moves the random address
|
|
||||||
generation from smsc95xx_reset() into smsc95xx_bind(), so that it is
|
|
||||||
done once on module load, not on every ifup. The user can then
|
|
||||||
override this using the standard mechanisms.
|
|
||||||
|
|
||||||
Applies against 2.6.35 and linux-2.6 head.
|
|
||||||
|
|
||||||
Upstream-Status: Backport [2.6.36]
|
|
||||||
|
|
||||||
Signed-off-by: Bernard Blackham <b-omap@largestprime.net>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/usb/smsc95xx.c | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
|
||||||
index 12a3c88..65cb1ab 100644
|
|
||||||
--- a/drivers/net/usb/smsc95xx.c
|
|
||||||
+++ b/drivers/net/usb/smsc95xx.c
|
|
||||||
@@ -805,8 +805,6 @@ static int smsc95xx_reset(struct usbnet *dev)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
- smsc95xx_init_mac_address(dev);
|
|
||||||
-
|
|
||||||
ret = smsc95xx_set_mac_address(dev);
|
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
@@ -1047,6 +1045,8 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf)
|
|
||||||
pdata->use_tx_csum = DEFAULT_TX_CSUM_ENABLE;
|
|
||||||
pdata->use_rx_csum = DEFAULT_RX_CSUM_ENABLE;
|
|
||||||
|
|
||||||
+ smsc95xx_init_mac_address(dev);
|
|
||||||
+
|
|
||||||
/* Init all registers */
|
|
||||||
ret = smsc95xx_reset(dev);
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.7.6
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
|
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
|
||||||
|
|
||||||
PRINC := "${@int(PRINC) + 2}"
|
PRINC := "${@int(PRINC) + 3}"
|
||||||
|
|
||||||
# Generic patches
|
|
||||||
SRC_URI_append = " file://smsc95xx-randomize-mac-once.patch"
|
|
||||||
|
|
||||||
# Board specific patches
|
# Board specific patches
|
||||||
SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino.patch"
|
SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino.patch"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user