---

yaml --- r: 69343 b: refs/heads/master c: 2b9e68f h: refs/heads/master i: 69341: 8f17969 69339: 91e587b 69335: ddc9aab 69327: a3323d2 69311: d999e62 v: v3
git-mirror · Oct 15, 2007 · a31a32e · a31a32e
1 parent 535864f
commit a31a32e
Show file tree

Hide file tree

Showing 57 changed files with 390 additions and 1,929 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43d39ae0cf8f891c35e8316948229c7cbffa3994
+refs/heads/master: 2b9e68f728d6b2cf38b252650f017576e8dae2ad
diff --git a/trunk/Documentation/networking/bonding.txt b/trunk/Documentation/networking/bonding.txt
@@ -281,39 +281,6 @@ downdelay
 	will be rounded down to the nearest multiple.  The default
 	value is 0.
 
-fail_over_mac
-
-	Specifies whether active-backup mode should set all slaves to
-	the same MAC address (the traditional behavior), or, when
-	enabled, change the bond's MAC address when changing the
-	active interface (i.e., fail over the MAC address itself).
-
-	Fail over MAC is useful for devices that cannot ever alter
-	their MAC address, or for devices that refuse incoming
-	broadcasts with their own source MAC (which interferes with
-	the ARP monitor).
-
-	The down side of fail over MAC is that every device on the
-	network must be updated via gratuitous ARP, vs. just updating
-	a switch or set of switches (which often takes place for any
-	traffic, not just ARP traffic, if the switch snoops incoming
-	traffic to update its tables) for the traditional method.  If
-	the gratuitous ARP is lost, communication may be disrupted.
-
-	When fail over MAC is used in conjuction with the mii monitor,
-	devices which assert link up prior to being able to actually
-	transmit and receive are particularly susecptible to loss of
-	the gratuitous ARP, and an appropriate updelay setting may be
-	required.
-
-	A value of 0 disables fail over MAC, and is the default.  A
-	value of 1 enables fail over MAC.  This option is enabled
-	automatically if the first slave added cannot change its MAC
-	address.  This option may be modified via sysfs only when no
-	slaves are present in the bond.
-
-	This option was added in bonding version 3.2.0.
-
 lacp_rate
 
 	Option specifying the rate in which we'll ask our link partner

diff --git a/trunk/arch/m68k/atari/atakeyb.c b/trunk/arch/m68k/atari/atakeyb.c
@@ -1,4 +1,6 @@
 /*
+ * linux/arch/m68k/atari/atakeyb.c
+ *
  * Atari Keyboard driver for 680x0 Linux
  *
  * This file is subject to the terms and conditions of the GNU General Public

diff --git a/trunk/arch/mips/au1000/common/prom.c b/trunk/arch/mips/au1000/common/prom.c
@@ -33,23 +33,26 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
 
-int prom_argc;
-char **prom_argv;
-char **prom_envp;
+/* #define DEBUG_CMDLINE */
+
+extern int prom_argc;
+extern char **prom_argv, **prom_envp;
+
 
 char * __init_or_module prom_getcmdline(void)
 {
 	return &(arcs_cmdline[0]);
 }
 
-void prom_init_cmdline(void)
+void  prom_init_cmdline(void)
 {
 	char *cp;
 	int actr;
@@ -58,7 +61,7 @@ void prom_init_cmdline(void)
 
 	cp = &(arcs_cmdline[0]);
 	while(actr < prom_argc) {
-		strcpy(cp, prom_argv[actr]);
+	        strcpy(cp, prom_argv[actr]);
 		cp += strlen(prom_argv[actr]);
 		*cp++ = ' ';
 		actr++;
@@ -67,8 +70,10 @@ void prom_init_cmdline(void)
 		--cp;
 	if (prom_argc > 1)
 		*cp = '\0';
+
 }
 
+
 char *prom_getenv(char *envname)
 {
 	/*
@@ -90,23 +95,21 @@ char *prom_getenv(char *envname)
 		}
 		env++;
 	}
-
 	return NULL;
 }
 
-static inline unsigned char str2hexnum(unsigned char c)
+inline unsigned char str2hexnum(unsigned char c)
 {
-	if (c >= '0' && c <= '9')
+	if(c >= '0' && c <= '9')
 		return c - '0';
-	if (c >= 'a' && c <= 'f')
+	if(c >= 'a' && c <= 'f')
 		return c - 'a' + 10;
-	if (c >= 'A' && c <= 'F')
+	if(c >= 'A' && c <= 'F')
 		return c - 'A' + 10;
-
 	return 0; /* foo */
 }
 
-static inline void str2eaddr(unsigned char *ea, unsigned char *str)
+inline void str2eaddr(unsigned char *ea, unsigned char *str)
 {
 	int i;
 
@@ -121,29 +124,35 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 	}
 }
 
-int prom_get_ethernet_addr(char *ethernet_addr)
+int get_ethernet_addr(char *ethernet_addr)
 {
-	char *ethaddr_str;
-	char *argptr;
+        char *ethaddr_str;
 
-	/* Check the environment variables first */
-	ethaddr_str = prom_getenv("ethaddr");
+        ethaddr_str = prom_getenv("ethaddr");
 	if (!ethaddr_str) {
-		/* Check command line */
-		argptr = prom_getcmdline();
-		ethaddr_str = strstr(argptr, "ethaddr=");
-		if (!ethaddr_str)
-			return -1;
-
-		ethaddr_str += strlen("ethaddr=");
+	        printk("ethaddr not set in boot prom\n");
+		return -1;
 	}
-
 	str2eaddr(ethernet_addr, ethaddr_str);
 
+#if 0
+	{
+		int i;
+
+	printk("get_ethernet_addr: ");
+	for (i=0; i<5; i++)
+		printk("%02x:", (unsigned char)*(ethernet_addr+i));
+	printk("%02x\n", *(ethernet_addr+i));
+	}
+#endif
+
 	return 0;
 }
-EXPORT_SYMBOL(prom_get_ethernet_addr);
 
 void __init prom_free_prom_memory(void)
 {
 }
+
+EXPORT_SYMBOL(prom_getcmdline);
+EXPORT_SYMBOL(get_ethernet_addr);
+EXPORT_SYMBOL(str2eaddr);
diff --git a/trunk/arch/mips/au1000/common/setup.c b/trunk/arch/mips/au1000/common/setup.c
@@ -40,11 +40,10 @@
 #include <asm/mipsregs.h>
 #include <asm/reboot.h>
 #include <asm/pgtable.h>
+#include <asm/mach-au1x00/au1000.h>
 #include <asm/time.h>
 
-#include <au1000.h>
-#include <prom.h>
-
+extern char * prom_getcmdline(void);
 extern void __init board_setup(void);
 extern void au1000_restart(char *);
 extern void au1000_halt(void);

diff --git a/trunk/arch/mips/au1000/db1x00/init.c b/trunk/arch/mips/au1000/db1x00/init.c
@@ -31,13 +31,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/mtx-1/init.c b/trunk/arch/mips/au1000/mtx-1/init.c
@@ -34,11 +34,13 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/pb1000/init.c b/trunk/arch/mips/au1000/pb1000/init.c
@@ -30,13 +30,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/pb1100/init.c b/trunk/arch/mips/au1000/pb1100/init.c
@@ -31,13 +31,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/pb1200/board_setup.c b/trunk/arch/mips/au1000/pb1200/board_setup.c
@@ -41,10 +41,8 @@
 #include <asm/mipsregs.h>
 #include <asm/reboot.h>
 #include <asm/pgtable.h>
-
-#include <au1000.h>
-#include <au1xxx_dbdma.h>
-#include <prom.h>
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/au1xxx_dbdma.h>
 
 #ifdef CONFIG_MIPS_PB1200
 #include <asm/mach-pb1x00/pb1200.h>

diff --git a/trunk/arch/mips/au1000/pb1200/init.c b/trunk/arch/mips/au1000/pb1200/init.c
@@ -31,13 +31,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/pb1500/init.c b/trunk/arch/mips/au1000/pb1500/init.c
@@ -31,13 +31,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/pb1550/init.c b/trunk/arch/mips/au1000/pb1550/init.c
@@ -31,13 +31,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/mips/au1000/xxs1500/init.c b/trunk/arch/mips/au1000/xxs1500/init.c
@@ -30,13 +30,15 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
 
-#include <prom.h>
+int prom_argc;
+char **prom_argv, **prom_envp;
+extern void  __init prom_init_cmdline(void);
+extern char *prom_getenv(char *envname);
 
 const char *get_system_type(void)
 {

diff --git a/trunk/arch/powerpc/platforms/cell/axon_msi.c b/trunk/arch/powerpc/platforms/cell/axon_msi.c
@@ -77,7 +77,12 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
 {
 	pr_debug("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
 
-	dcr_write(msic->dcr_host, dcr_n, val);
+	dcr_write(msic->dcr_host, msic->dcr_host.base + dcr_n, val);
+}
+
+static u32 msic_dcr_read(struct axon_msic *msic, unsigned int dcr_n)
+{
+	return dcr_read(msic->dcr_host, msic->dcr_host.base + dcr_n);
 }
 
 static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
@@ -86,7 +91,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
 	u32 write_offset, msi;
 	int idx;
 
-	write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG);
+	write_offset = msic_dcr_read(msic, MSIC_WRITE_OFFSET_REG);
 	pr_debug("axon_msi: original write_offset 0x%x\n", write_offset);
 
 	/* write_offset doesn't wrap properly, so we have to mask it */
@@ -301,7 +306,7 @@ static int axon_msi_notify_reboot(struct notifier_block *nb,
 	list_for_each_entry(msic, &axon_msic_list, list) {
 		pr_debug("axon_msi: disabling %s\n",
 			  msic->irq_host->of_node->full_name);
-		tmp  = dcr_read(msic->dcr_host, MSIC_CTRL_REG);
+		tmp  = msic_dcr_read(msic, MSIC_CTRL_REG);
 		tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;
 		msic_dcr_write(msic, MSIC_CTRL_REG, tmp);
 	}