projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[WEXT]: Remove dead debug code.
[powerpc.git]
/
net
/
wanrouter
/
wanmain.c
diff --git
a/net/wanrouter/wanmain.c
b/net/wanrouter/wanmain.c
index
769cdd6
..
7a19e0e
100644
(file)
--- a/
net/wanrouter/wanmain.c
+++ b/
net/wanrouter/wanmain.c
@@
-86,8
+86,8
@@
static int wanrouter_device_del_if(struct wan_device *wandev,
static struct wan_device *wanrouter_find_device(char *name);
static int wanrouter_delete_interface(struct wan_device *wandev, char *name);
static struct wan_device *wanrouter_find_device(char *name);
static int wanrouter_delete_interface(struct wan_device *wandev, char *name);
-void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
-void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
+
static
void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
+
static
void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
@@
-104,8
+104,8
@@
struct wan_device* wanrouter_router_devlist; /* list of registered devices */
* Organize Unique Identifiers for encapsulation/decapsulation
*/
* Organize Unique Identifiers for encapsulation/decapsulation
*/
-static unsigned char wanrouter_oui_ether[] = { 0x00, 0x00, 0x00 };
#if 0
#if 0
+static unsigned char wanrouter_oui_ether[] = { 0x00, 0x00, 0x00 };
static unsigned char wanrouter_oui_802_2[] = { 0x00, 0x80, 0xC2 };
#endif
static unsigned char wanrouter_oui_802_2[] = { 0x00, 0x80, 0xC2 };
#endif
@@
-246,6
+246,8
@@
int unregister_wan_device(char *name)
return 0;
}
return 0;
}
+#if 0
+
/*
* Encapsulate packet.
*
/*
* Encapsulate packet.
*
@@
-275,8
+277,8
@@
int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev,
skb_push(skb, 7);
skb->data[0] = 0;
skb->data[1] = NLPID_SNAP;
skb_push(skb, 7);
skb->data[0] = 0;
skb->data[1] = NLPID_SNAP;
-
memcpy(&skb->data[2]
, wanrouter_oui_ether,
- sizeof(wanrouter_oui_ether));
+
skb_copy_to_linear_data_offset(skb, 2
, wanrouter_oui_ether,
+
sizeof(wanrouter_oui_ether));
*((unsigned short*)&skb->data[5]) = htons(type);
break;
*((unsigned short*)&skb->data[5]) = htons(type);
break;
@@
-312,10
+314,10
@@
__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
cnt += 1;
break;
cnt += 1;
break;
-
case NLPID_SNAP:
/* SNAP encapsulation */
+
case NLPID_SNAP:
/* SNAP encapsulation */
if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether,
sizeof(wanrouter_oui_ether))){
if (memcmp(&skb->data[cnt + 1], wanrouter_oui_ether,
sizeof(wanrouter_oui_ether))){
- printk(KERN_INFO
+ printk(KERN_INFO
"%s: unsupported SNAP OUI %02X-%02X-%02X "
"on interface %s!\n", wanrouter_modname,
skb->data[cnt+1], skb->data[cnt+2],
"%s: unsupported SNAP OUI %02X-%02X-%02X "
"on interface %s!\n", wanrouter_modname,
skb->data[cnt+1], skb->data[cnt+2],
@@
-337,10
+339,11
@@
__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
skb->protocol = ethertype;
skb->pkt_type = PACKET_HOST; /* Physically point to point */
skb_pull(skb, cnt);
skb->protocol = ethertype;
skb->pkt_type = PACKET_HOST; /* Physically point to point */
skb_pull(skb, cnt);
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
return ethertype;
}
return ethertype;
}
+#endif /* 0 */
/*
* WAN device IOCTL.
/*
* WAN device IOCTL.
@@
-447,7
+450,7
@@
static int wanrouter_device_setup(struct wan_device *wandev,
kfree(conf);
printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n",
wandev->name);
kfree(conf);
printk(KERN_INFO "%s: ERROR, Invalid MAGIC Number\n",
wandev->name);
- return -EINVAL;
+ return -EINVAL;
}
if (conf->data_size && conf->data) {
}
if (conf->data_size && conf->data) {
@@
-456,13
+459,13
@@
static int wanrouter_device_setup(struct wan_device *wandev,
"%s: ERROR, Invalid firmware data size %i !\n",
wandev->name, conf->data_size);
kfree(conf);
"%s: ERROR, Invalid firmware data size %i !\n",
wandev->name, conf->data_size);
kfree(conf);
- return -EINVAL;
+ return -EINVAL;
}
data = vmalloc(conf->data_size);
if (!data) {
printk(KERN_INFO
}
data = vmalloc(conf->data_size);
if (!data) {
printk(KERN_INFO
- "%s: ERROR, Faild allocate kernel memory !\n",
+ "%s: ERROR, Faild allocate kernel memory !\n",
wandev->name);
kfree(conf);
return -ENOBUFS;
wandev->name);
kfree(conf);
return -ENOBUFS;
@@
-683,7
+686,7
@@
out:
static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name)
{
char name[WAN_IFNAME_SZ + 1];
static int wanrouter_device_del_if(struct wan_device *wandev, char __user *u_name)
{
char name[WAN_IFNAME_SZ + 1];
-
int err = 0;
+ int err = 0;
if (wandev->state == WAN_UNCONFIGURED)
return -ENODEV;
if (wandev->state == WAN_UNCONFIGURED)
return -ENODEV;
@@
-706,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)
-
err = wandev->shutdown(wandev);
+ if (!wandev->ndev && wandev->shutdown)
+ err = wandev->shutdown(wandev);
return err;
}
return err;
}
@@
-799,23
+802,19
@@
static int wanrouter_delete_interface(struct wan_device *wandev, char *name)
return 0;
}
return 0;
}
-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);
}
}
-void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)
+
static
void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags)
{
spin_unlock_irqrestore(lock, *smp_flags);
}
EXPORT_SYMBOL(register_wan_device);
EXPORT_SYMBOL(unregister_wan_device);
{
spin_unlock_irqrestore(lock, *smp_flags);
}
EXPORT_SYMBOL(register_wan_device);
EXPORT_SYMBOL(unregister_wan_device);
-EXPORT_SYMBOL(wanrouter_encapsulate);
-EXPORT_SYMBOL(wanrouter_type_trans);
-EXPORT_SYMBOL(lock_adapter_irq);
-EXPORT_SYMBOL(unlock_adapter_irq);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");