8 files changed, 29 insertions, 132 deletions

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index c9d9473a5ab2..5ed654ae66e1 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -873,7 +873,7 @@ static struct adf702x_platform_data adf7021_platform_data = {
 };
 static inline void adf702x_mac_init(void)
 {
-        random_ether_addr(adf7021_platform_data.mac_addr);
+        eth_random_addr(adf7021_platform_data.mac_addr);
 }
 #else
 static inline void adf702x_mac_init(void) {}
diff --git a/arch/c6x/kernel/soc.c b/arch/c6x/kernel/soc.c
index 0748c94ebef6..3ac74080fded 100644
--- a/arch/c6x/kernel/soc.c
+++ b/arch/c6x/kernel/soc.c
@@ -80,7 +80,7 @@ int soc_mac_addr(unsigned int index, u8 *addr)
                 if (have_fuse_mac)
                         memcpy(addr, c6x_fuse_mac, 6);
                 else
-                        random_ether_addr(addr);
+                        eth_random_addr(addr);
         }
 
         /* adjust for specific EMAC device */
diff --git a/arch/m68k/include/asm/mcfne.h b/arch/m68k/include/asm/mcf8390.h
index bf638be0958c..a72a20819a54 100644
--- a/arch/m68k/include/asm/mcfne.h
+++ b/arch/m68k/include/asm/mcf8390.h
@@ -1,7 +1,7 @@
 /****************************************************************************/
 
 /*
- *      mcfne.h -- NE2000 in ColdFire eval boards.
+ *      mcf8390.h -- NS8390 support for ColdFire eval boards.
  *
  *      (C) Copyright 1999-2000, Greg Ungerer (gerg@snapgear.com)
  *      (C) Copyright 2000,      Lineo (www.lineo.com)
@@ -14,8 +14,8 @@
  */
 
 /****************************************************************************/
-#ifndef mcfne_h
-#define mcfne_h
+#ifndef mcf8390_h
+#define mcf8390_h
 /****************************************************************************/
 
 
@@ -37,6 +37,7 @@
 #if defined(CONFIG_ARN5206)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0xf0
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        4
@@ -46,6 +47,7 @@
 #if defined(CONFIG_M5206eC3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1c
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        4
@@ -54,6 +56,7 @@
 
 #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)
 #define NE2000_ADDR             0x30000300
+#define NE2000_ADDRSIZE         0x00001000
 #define NE2000_IRQ_VECTOR       25
 #define NE2000_IRQ_PRIORITY     1
 #define NE2000_IRQ_LEVEL        3
@@ -63,6 +66,7 @@
 #if defined(CONFIG_M5307C3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_BYTE             volatile unsigned short
 #endif
@@ -70,6 +74,7 @@
 #if defined(CONFIG_M5272) && defined(CONFIG_NETtel)
 #define NE2000_ADDR             0x30600300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR       67
 #undef  BSWAP
 #define BSWAP(w)                (w)
@@ -82,6 +87,7 @@
 #define NE2000_ADDR0            0x30600300
 #define NE2000_ADDR1            0x30800300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR0      27
 #define NE2000_IRQ_VECTOR1      29
 #undef  BSWAP
@@ -94,6 +100,7 @@
 #if defined(CONFIG_M5307) && defined(CONFIG_SECUREEDGEMP3)
 #define NE2000_ADDR             0x30600300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR       27
 #undef  BSWAP
 #define BSWAP(w)                (w)
@@ -105,6 +112,7 @@
 #if defined(CONFIG_ARN5307)
 #define NE2000_ADDR             0xfe600300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        3
@@ -114,129 +122,10 @@
 #if defined(CONFIG_M5407C3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_BYTE             volatile unsigned short
 #endif
 
 /****************************************************************************/
-
-/*
- *      Side-band address space for odd address requires re-mapping
- *      many of the standard ISA access functions.
- */
-#ifdef NE2000_ODDOFFSET
-
-#undef outb
-#undef outb_p
-#undef inb
-#undef inb_p
-#undef outsb
-#undef outsw
-#undef insb
-#undef insw
-
-#define outb    ne2000_outb
-#define inb     ne2000_inb
-#define outb_p  ne2000_outb
-#define inb_p   ne2000_inb
-#define outsb   ne2000_outsb
-#define outsw   ne2000_outsw
-#define insb    ne2000_insb
-#define insw    ne2000_insw
-
-
-#ifndef COLDFIRE_NE2000_FUNCS
-
-void ne2000_outb(unsigned int val, unsigned int addr);
-int  ne2000_inb(unsigned int addr);
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len);
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsb(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len);
-
-#else
-
-/*
- *      This macro converts a conventional register address into the
- *      real memory pointer of the mapped NE2000 device.
- *      On most NE2000 implementations on ColdFire boards the chip is
- *      mapped in kinda funny, due to its ISA heritage.
- */
-#define NE2000_PTR(addr)        ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr))
-#define NE2000_DATA_PTR(addr)   (addr)
-
-
-void ne2000_outb(unsigned int val, unsigned int addr)
-{
-        NE2000_BYTE     *rp;
-
-        rp = (NE2000_BYTE *) NE2000_PTR(addr);
-        *rp = RSWAP(val);
-}
-
-int ne2000_inb(unsigned int addr)
-{
-        NE2000_BYTE     *rp, val;
-
-        rp = (NE2000_BYTE *) NE2000_PTR(addr);
-        val = *rp;
-        return((int) ((NE2000_BYTE) RSWAP(val)));
-}
-
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len)
-{
-        NE2000_BYTE     *rp, val;
-        unsigned char   *buf;
-
-        buf = (unsigned char *) vbuf;
-        rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                val = *rp;
-                *buf++ = RSWAP(val);
-        }
-}
-
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len)
-{
-        volatile unsigned short *rp;
-        unsigned short          w, *buf;
-
-        buf = (unsigned short *) vbuf;
-        rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                w = *rp;
-                *buf++ = BSWAP(w);
-        }
-}
-
-void ne2000_outsb(unsigned int addr, const void *vbuf, unsigned long len)
-{
-        NE2000_BYTE     *rp, val;
-        unsigned char   *buf;
-
-        buf = (unsigned char *) vbuf;
-        rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                val = *buf++;
-                *rp = RSWAP(val);
-        }
-}
-
-void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
-{
-        volatile unsigned short *rp;
-        unsigned short          w, *buf;
-
-        buf = (unsigned short *) vbuf;
-        rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                w = *buf++;
-                *rp = BSWAP(w);
-        }
-}
-
-#endif /* COLDFIRE_NE2000_FUNCS */
-#endif /* NE2000_OFFOFFSET */
-
-/****************************************************************************/
-#endif  /* mcfne_h */
+#endif  /* mcf8390_h */
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 1a24d317e7a3..1bbc24b08685 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned char *dev_addr)
                                         &dev_addr[4], &dev_addr[5]) != 6) {
                         pr_warning("cannot parse mac address, "
                                         "using random address\n");
-                        random_ether_addr(dev_addr);
+                        eth_random_addr(dev_addr);
                 }
         } else
-                random_ether_addr(dev_addr);
+                eth_random_addr(dev_addr);
 }
 
 /*****************************************************************************
diff --git a/arch/mips/powertv/powertv_setup.c b/arch/mips/powertv/powertv_setup.c
index 3933c373a438..820b8480f222 100644
--- a/arch/mips/powertv/powertv_setup.c
+++ b/arch/mips/powertv/powertv_setup.c
@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
  * Generates an Ethernet MAC address that is highly likely to be unique for
  * this particular system on a network with other systems of the same type.
  *
- * The problem we are solving is that, when random_ether_addr() is used to
+ * The problem we are solving is that, when eth_random_addr() is used to
  * generate MAC addresses at startup, there isn't much entropy for the random
  * number generator to use and the addresses it produces are fairly likely to
  * be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
  * Still, this does give us something to work with.
  *
  * The approach we take is:
- * 1.   If we can't get the RF MAC Address, just call random_ether_addr.
+ * 1.   If we can't get the RF MAC Address, just call eth_random_addr.
  * 2.   Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
  *      bits of the new address. This is very likely to be unique, except for
  *      the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
         if (!have_rfmac) {
                 pr_warning("rfmac not available on command line; "
                         "generating random MAC address\n");
-                random_ether_addr(addr);
+                eth_random_addr(addr);
         }
 
         else {
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 1a69244e785b..e9073e9501b3 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -96,6 +96,7 @@ static void bpf_flush_icache(void *start_, void *end_)
 #define AND             F3(2, 0x01)
 #define ANDCC           F3(2, 0x11)
 #define OR              F3(2, 0x02)
+#define XOR             F3(2, 0x03)
 #define SUB             F3(2, 0x04)
 #define SUBCC           F3(2, 0x14)
 #define MUL             F3(2, 0x0a)     /* umul */
@@ -462,6 +463,9 @@ void bpf_jit_compile(struct sk_filter *fp)
                         case BPF_S_ALU_OR_K:    /* A |= K */
                                 emit_alu_K(OR, K);
                                 break;
+                        case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                                emit_alu_X(XOR);
+                                break;
                         case BPF_S_ALU_LSH_X:   /* A <<= X */
                                 emit_alu_X(SLL);
                                 break;
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 0d60c5685c26..458d324f062d 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -339,7 +339,7 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name)
 random:
         printk(KERN_INFO
                "Choosing a random ethernet address for device %s\n", name);
-        random_ether_addr(addr);
+        eth_random_addr(addr);
         return 1;
 }
 
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 0597f95b6da6..33643a8bcbbb 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -309,6 +309,10 @@ void bpf_jit_compile(struct sk_filter *fp)
                                 else
                                         EMIT1_off32(0x0d, K);   /* or imm32,%eax */
                                 break;
+                        case BPF_S_ANC_ALU_XOR_X: /* A ^= X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x31, 0xd8);              /* xor %ebx,%eax */
+                                break;
                         case BPF_S_ALU_LSH_X: /* A <<= X; */
                                 seen |= SEEN_XREG;
                                 EMIT4(0x89, 0xd9, 0xd3, 0xe0);  /* mov %ebx,%ecx; shl %cl,%eax */