diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-08 00:35:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:20 -0700 |
| commit | 0ba34e197a45c1639aa56aea0399e97f827abb35 (patch) | |
| tree | d570dc4ae06ebbb98a6a1c7b2f8cd8c79f225d7d /arch/um/drivers | |
| parent | 7d98230a73c21b4d0cee9c3aca38190d215e0e39 (diff) | |
| download | kernel-crypto-0ba34e197a45c1639aa56aea0399e97f827abb35.tar.gz kernel-crypto-0ba34e197a45c1639aa56aea0399e97f827abb35.tar.xz kernel-crypto-0ba34e197a45c1639aa56aea0399e97f827abb35.zip | |
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>
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/pcap_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |