From: Jeff Dike <jdike@addtoit.com>
Date: Tue, 8 May 2007 07:35:06 +0000 (-0700)
Subject: uml: pcap devices should get MACs from command line
X-Git-Tag: v2.6.22-rc1~528
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0ba34e197a45c1639aa56aea0399e97f827abb35;p=linux-2.6-omap-h63xx.git

uml: pcap devices should get MACs from command line

Allow a pcap device to be assigned a MAC on the command line.  They don't
really need one, but it is handy to be able to do when your distro assigns a
new ethernet device whenever it sees a new MAC.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 8b27eae357e..c329931673d 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -70,7 +70,7 @@ int pcap_setup(char *str, char **mac_out, void *data)
 		  .filter 	= NULL });
 
 	remain = split_if_spec(str, &host_if, &init->filter,
-			       &options[0], &options[1], NULL);
+			       &options[0], &options[1], mac_out, NULL);
 	if(remain != NULL){
 		printk(KERN_ERR "pcap_setup - Extra garbage on "
 		       "specification : '%s'\n", remain);