mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 17:29:41 +02:00
c92885c466
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
diff -urN linux-2.6.19.ref/drivers/net/b44.c linux-2.6.19/drivers/net/b44.c
|
|
--- linux-2.6.19.ref/drivers/net/b44.c 2006-12-04 21:34:14.000000000 +0100
|
|
+++ linux-2.6.19/drivers/net/b44.c 2006-12-04 21:34:19.000000000 +0100
|
|
@@ -1445,6 +1445,7 @@
|
|
{
|
|
struct b44 *bp = netdev_priv(dev);
|
|
struct sockaddr *addr = p;
|
|
+ u32 val;
|
|
|
|
if (netif_running(dev))
|
|
return -EBUSY;
|
|
@@ -1455,7 +1456,11 @@
|
|
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
|
|
|
|
spin_lock_irq(&bp->lock);
|
|
- __b44_set_mac_addr(bp);
|
|
+
|
|
+ val = br32(bp, B44_RXCONFIG);
|
|
+ if (!(val & RXCONFIG_CAM_ABSENT))
|
|
+ __b44_set_mac_addr(bp);
|
|
+
|
|
spin_unlock_irq(&bp->lock);
|
|
|
|
return 0;
|
|
@@ -1797,7 +1802,7 @@
|
|
|
|
val = br32(bp, B44_RXCONFIG);
|
|
val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
|
|
- if (dev->flags & IFF_PROMISC) {
|
|
+ if ((dev->flags & IFF_PROMISC) || (val & RXCONFIG_CAM_ABSENT)) {
|
|
val |= RXCONFIG_PROMISC;
|
|
bw32(bp, B44_RXCONFIG, val);
|
|
} else {
|
|
diff -urN linux-2.6.19.ref/drivers/net/b44.h linux-2.6.19/drivers/net/b44.h
|
|
--- linux-2.6.19.ref/drivers/net/b44.h 2006-12-04 21:34:14.000000000 +0100
|
|
+++ linux-2.6.19/drivers/net/b44.h 2006-12-04 21:34:19.000000000 +0100
|
|
@@ -129,6 +129,7 @@
|
|
#define RXCONFIG_FLOW 0x00000020 /* Flow Control Enable */
|
|
#define RXCONFIG_FLOW_ACCEPT 0x00000040 /* Accept Unicast Flow Control Frame */
|
|
#define RXCONFIG_RFILT 0x00000080 /* Reject Filter */
|
|
+#define RXCONFIG_CAM_ABSENT 0x00000100 /* CAM Absent */
|
|
#define B44_RXMAXLEN 0x0404UL /* EMAC RX Max Packet Length */
|
|
#define B44_TXMAXLEN 0x0408UL /* EMAC TX Max Packet Length */
|
|
#define B44_MDIO_CTRL 0x0410UL /* EMAC MDIO Control */
|