diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:25:25 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:20:20 -0500 |
commit | 4ba6122b4e0537858e8579716896f01acf55f745 (patch) | |
tree | 3527b20fd48769cd481671b382772053b3d1f704 /net/wanrouter/wanmain.c | |
parent | ac7bfa62f3ad06a2a2ac3938b7e6fc4f318a762d (diff) |
[NET] WANROUTER: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wanrouter/wanmain.c')
-rw-r--r-- | net/wanrouter/wanmain.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 4d90a179aeda..5d2d93dc0837 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -314,10 +314,10 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
314 | cnt += 1; | 314 | cnt += 1; |
315 | break; | 315 | break; |
316 | 316 | ||
317 | case NLPID_SNAP: /* SNAP encapsulation */ | 317 | case NLPID_SNAP: /* SNAP encapsulation */ |
318 | if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether, | 318 | if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether, |
319 | sizeof(wanrouter_oui_ether))){ | 319 | sizeof(wanrouter_oui_ether))){ |
320 | printk(KERN_INFO | 320 | printk(KERN_INFO |
321 | "%s: unsupported SNAP OUI %02X-%02X-%02X " | 321 | "%s: unsupported SNAP OUI %02X-%02X-%02X " |
322 | "on interface %s!\n", wanrouter_modname, | 322 | "on interface %s!\n", wanrouter_modname, |
323 | skb->data[cnt+1], skb->data[cnt+2], | 323 | skb->data[cnt+1], skb->data[cnt+2], |
@@ -450,7 +450,7 @@ static int wanrouter_device_setup(struct wan_device *wandev, | |||
450 | kfree(conf); | 450 | kfree(conf); |
451 | printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n", | 451 | printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n", |
452 | wandev->name); | 452 | wandev->name); |
453 | return -EINVAL; | 453 | return -EINVAL; |
454 | } | 454 | } |
455 | 455 | ||
456 | if (conf->data_size && conf->data) { | 456 | if (conf->data_size && conf->data) { |
@@ -459,13 +459,13 @@ static int wanrouter_device_setup(struct wan_device *wandev, | |||
459 | "%s: ERROR, Invalid firmware data size %i !\n", | 459 | "%s: ERROR, Invalid firmware data size %i !\n", |
460 | wandev->name, conf->data_size); | 460 | wandev->name, conf->data_size); |
461 | kfree(conf); | 461 | kfree(conf); |
462 | return -EINVAL; | 462 | return -EINVAL; |
463 | } | 463 | } |
464 | 464 | ||
465 | data = vmalloc(conf->data_size); | 465 | data = vmalloc(conf->data_size); |
466 | if (!data) { | 466 | if (!data) { |
467 | printk(KERN_INFO | 467 | printk(KERN_INFO |
468 | "%s: ERROR, Faild allocate kernel memory !\n", | 468 | "%s: ERROR, Faild allocate kernel memory !\n", |
469 | wandev->name); | 469 | wandev->name); |
470 | kfree(conf); | 470 | kfree(conf); |
471 | return -ENOBUFS; | 471 | return -ENOBUFS; |
@@ -686,7 +686,7 @@ out: | |||
686 | static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name) | 686 | static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name) |
687 | { | 687 | { |
688 | char name[WAN_IFNAME_SZ + 1]; | 688 | char name[WAN_IFNAME_SZ + 1]; |
689 | int err = 0; | 689 | int err = 0; |
690 | 690 | ||
691 | if (wandev->state == WAN_UNCONFIGURED) | 691 | if (wandev->state == WAN_UNCONFIGURED) |
692 | return -ENODEV; | 692 | return -ENODEV; |
@@ -709,8 +709,8 @@ static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_nam | |||
709 | * interfaces are deleted and the link irrecoverably disconnected. | 709 | * interfaces are deleted and the link irrecoverably disconnected. |
710 | */ | 710 | */ |
711 | 711 | ||
712 | if (!wandev->ndev && wandev->shutdown) | 712 | if (!wandev->ndev && wandev->shutdown) |
713 | err = wandev->shutdown(wandev); | 713 | err = wandev->shutdown(wandev); |
714 | 714 | ||
715 | return err; | 715 | return err; |
716 | } | 716 | } |
@@ -804,7 +804,7 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) | |||
804 | 804 | ||
805 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | 805 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
806 | { | 806 | { |
807 | spin_lock_irqsave(lock, *smp_flags); | 807 | spin_lock_irqsave(lock, *smp_flags); |
808 | } | 808 | } |
809 | 809 | ||
810 | 810 | ||