]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
uml: pcap devices should get MACs from command line
authorJeff Dike <jdike@addtoit.com>
Tue, 8 May 2007 07:35:06 +0000 (00:35 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:15:20 +0000 (11:15 -0700)
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>
arch/um/drivers/pcap_kern.c

index 8b27eae357efbe779cca815f6e2e4ab58ebd4f98..c329931673d6a2ed8ebd68d3f438125bebc588f7 100644 (file)
@@ -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);