mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
[NET] WANROUTER: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ac7bfa62f3
commit
4ba6122b4e
3 changed files with 268 additions and 268 deletions
File diff suppressed because it is too large
Load diff
|
@ -314,10 +314,10 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
|
||||||
cnt += 1;
|
cnt += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NLPID_SNAP: /* SNAP encapsulation */
|
case NLPID_SNAP: /* SNAP encapsulation */
|
||||||
if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether,
|
if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether,
|
||||||
sizeof(wanrouter_oui_ether))){
|
sizeof(wanrouter_oui_ether))){
|
||||||
printk(KERN_INFO
|
printk(KERN_INFO
|
||||||
"%s: unsupported SNAP OUI %02X-%02X-%02X "
|
"%s: unsupported SNAP OUI %02X-%02X-%02X "
|
||||||
"on interface %s!\n", wanrouter_modname,
|
"on interface %s!\n", wanrouter_modname,
|
||||||
skb->data[cnt+1], skb->data[cnt+2],
|
skb->data[cnt+1], skb->data[cnt+2],
|
||||||
|
@ -450,7 +450,7 @@ static int wanrouter_device_setup(struct wan_device *wandev,
|
||||||
kfree(conf);
|
kfree(conf);
|
||||||
printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n",
|
printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n",
|
||||||
wandev->name);
|
wandev->name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (conf->data_size && conf->data) {
|
if (conf->data_size && conf->data) {
|
||||||
|
@ -459,13 +459,13 @@ static int wanrouter_device_setup(struct wan_device *wandev,
|
||||||
"%s: ERROR, Invalid firmware data size %i !\n",
|
"%s: ERROR, Invalid firmware data size %i !\n",
|
||||||
wandev->name, conf->data_size);
|
wandev->name, conf->data_size);
|
||||||
kfree(conf);
|
kfree(conf);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
data = vmalloc(conf->data_size);
|
data = vmalloc(conf->data_size);
|
||||||
if (!data) {
|
if (!data) {
|
||||||
printk(KERN_INFO
|
printk(KERN_INFO
|
||||||
"%s: ERROR, Faild allocate kernel memory !\n",
|
"%s: ERROR, Faild allocate kernel memory !\n",
|
||||||
wandev->name);
|
wandev->name);
|
||||||
kfree(conf);
|
kfree(conf);
|
||||||
return -ENOBUFS;
|
return -ENOBUFS;
|
||||||
|
@ -686,7 +686,7 @@ out:
|
||||||
static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name)
|
static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name)
|
||||||
{
|
{
|
||||||
char name[WAN_IFNAME_SZ + 1];
|
char name[WAN_IFNAME_SZ + 1];
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
if (wandev->state == WAN_UNCONFIGURED)
|
if (wandev->state == WAN_UNCONFIGURED)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -709,8 +709,8 @@ static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_nam
|
||||||
* interfaces are deleted and the link irrecoverably disconnected.
|
* interfaces are deleted and the link irrecoverably disconnected.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!wandev->ndev && wandev->shutdown)
|
if (!wandev->ndev && wandev->shutdown)
|
||||||
err = wandev->shutdown(wandev);
|
err = wandev->shutdown(wandev);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -804,7 +804,7 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
|
||||||
|
|
||||||
static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)
|
static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)
|
||||||
{
|
{
|
||||||
spin_lock_irqsave(lock, *smp_flags);
|
spin_lock_irqsave(lock, *smp_flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,10 @@
|
||||||
|
|
||||||
#define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\
|
#define PROT_DECODE(prot) ((prot == WANCONFIG_FR) ? " FR" :\
|
||||||
(prot == WANCONFIG_X25) ? " X25" : \
|
(prot == WANCONFIG_X25) ? " X25" : \
|
||||||
(prot == WANCONFIG_PPP) ? " PPP" : \
|
(prot == WANCONFIG_PPP) ? " PPP" : \
|
||||||
(prot == WANCONFIG_CHDLC) ? " CHDLC": \
|
(prot == WANCONFIG_CHDLC) ? " CHDLC": \
|
||||||
(prot == WANCONFIG_MPPP) ? " MPPP" : \
|
(prot == WANCONFIG_MPPP) ? " MPPP" : \
|
||||||
" Unknown" )
|
" Unknown" )
|
||||||
|
|
||||||
/****** Function Prototypes *************************************************/
|
/****** Function Prototypes *************************************************/
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue