Commit 97353cb4 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[NET] net/wanrouter/wanmain.c: cleanups



This patch contains the following cleanups:
- make the following needlessly global functions static:
  - lock_adapter_irq()
  - unlock_adapter_irq()
- #if 0 the following unused global functions:
  - wanrouter_encapsulate()
  - wanrouter_type_trans()
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84ff602e
...@@ -516,9 +516,6 @@ struct wan_device { ...@@ -516,9 +516,6 @@ struct wan_device {
/* Public functions available for device drivers */ /* Public functions available for device drivers */
extern int register_wan_device(struct wan_device *wandev); extern int register_wan_device(struct wan_device *wandev);
extern int unregister_wan_device(char *name); extern int unregister_wan_device(char *name);
__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev);
int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev,
unsigned short type);
/* Proc interface functions. These must not be called by the drivers! */ /* Proc interface functions. These must not be called by the drivers! */
extern int wanrouter_proc_init(void); extern int wanrouter_proc_init(void);
...@@ -527,11 +524,6 @@ extern int wanrouter_proc_add(struct wan_device *wandev); ...@@ -527,11 +524,6 @@ extern int wanrouter_proc_add(struct wan_device *wandev);
extern int wanrouter_proc_delete(struct wan_device *wandev); extern int wanrouter_proc_delete(struct wan_device *wandev);
extern int wanrouter_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); extern int wanrouter_ioctl( struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
extern void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
extern void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags);
/* Public Data */ /* Public Data */
/* list of registered devices */ /* list of registered devices */
extern struct wan_device *wanrouter_router_devlist; extern struct wan_device *wanrouter_router_devlist;
......
...@@ -86,8 +86,8 @@ static int wanrouter_device_del_if(struct wan_device *wandev, ...@@ -86,8 +86,8 @@ static int wanrouter_device_del_if(struct wan_device *wandev,
static struct wan_device *wanrouter_find_device(char *name); static struct wan_device *wanrouter_find_device(char *name);
static int wanrouter_delete_interface(struct wan_device *wandev, char *name); static int wanrouter_delete_interface(struct wan_device *wandev, char *name);
void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); static void lock_adapter_irq(spinlock_t *lock, unsigned long *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);
...@@ -104,8 +104,8 @@ struct wan_device* wanrouter_router_devlist; /* list of registered devices */ ...@@ -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 }; static unsigned char wanrouter_oui_802_2[] = { 0x00, 0x80, 0xC2 };
#endif #endif
...@@ -246,6 +246,8 @@ int unregister_wan_device(char *name) ...@@ -246,6 +246,8 @@ int unregister_wan_device(char *name)
return 0; return 0;
} }
#if 0
/* /*
* Encapsulate packet. * Encapsulate packet.
* *
...@@ -341,6 +343,7 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -341,6 +343,7 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
return ethertype; return ethertype;
} }
#endif /* 0 */
/* /*
* WAN device IOCTL. * WAN device IOCTL.
...@@ -799,23 +802,19 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) ...@@ -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); spin_unlock_irqrestore(lock, *smp_flags);
} }
EXPORT_SYMBOL(register_wan_device); EXPORT_SYMBOL(register_wan_device);
EXPORT_SYMBOL(unregister_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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment