diff options
Diffstat (limited to 'net/wanrouter')
-rw-r--r-- | net/wanrouter/wanmain.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 769cdd62c1bb..4d90a179aeda 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -86,8 +86,8 @@ static int wanrouter_device_del_if(struct wan_device *wandev, | |||
86 | 86 | ||
87 | static struct wan_device *wanrouter_find_device(char *name); | 87 | static struct wan_device *wanrouter_find_device(char *name); |
88 | static int wanrouter_delete_interface(struct wan_device *wandev, char *name); | 88 | static int wanrouter_delete_interface(struct wan_device *wandev, char *name); |
89 | void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); | 89 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); |
90 | void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); | 90 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags); |
91 | 91 | ||
92 | 92 | ||
93 | 93 | ||
@@ -104,8 +104,8 @@ struct wan_device* wanrouter_router_devlist; /* list of registered devices */ | |||
104 | * Organize Unique Identifiers for encapsulation/decapsulation | 104 | * Organize Unique Identifiers for encapsulation/decapsulation |
105 | */ | 105 | */ |
106 | 106 | ||
107 | static unsigned char wanrouter_oui_ether[] = { 0x00, 0x00, 0x00 }; | ||
108 | #if 0 | 107 | #if 0 |
108 | static unsigned char wanrouter_oui_ether[] = { 0x00, 0x00, 0x00 }; | ||
109 | static unsigned char wanrouter_oui_802_2[] = { 0x00, 0x80, 0xC2 }; | 109 | static unsigned char wanrouter_oui_802_2[] = { 0x00, 0x80, 0xC2 }; |
110 | #endif | 110 | #endif |
111 | 111 | ||
@@ -246,6 +246,8 @@ int unregister_wan_device(char *name) | |||
246 | return 0; | 246 | return 0; |
247 | } | 247 | } |
248 | 248 | ||
249 | #if 0 | ||
250 | |||
249 | /* | 251 | /* |
250 | * Encapsulate packet. | 252 | * Encapsulate packet. |
251 | * | 253 | * |
@@ -341,6 +343,7 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
341 | return ethertype; | 343 | return ethertype; |
342 | } | 344 | } |
343 | 345 | ||
346 | #endif /* 0 */ | ||
344 | 347 | ||
345 | /* | 348 | /* |
346 | * WAN device IOCTL. | 349 | * WAN device IOCTL. |
@@ -799,23 +802,19 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) | |||
799 | return 0; | 802 | return 0; |
800 | } | 803 | } |
801 | 804 | ||
802 | void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | 805 | static void lock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
803 | { | 806 | { |
804 | spin_lock_irqsave(lock, *smp_flags); | 807 | spin_lock_irqsave(lock, *smp_flags); |
805 | } | 808 | } |
806 | 809 | ||
807 | 810 | ||
808 | void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) | 811 | static void unlock_adapter_irq(spinlock_t *lock, unsigned long *smp_flags) |
809 | { | 812 | { |
810 | spin_unlock_irqrestore(lock, *smp_flags); | 813 | spin_unlock_irqrestore(lock, *smp_flags); |
811 | } | 814 | } |
812 | 815 | ||
813 | EXPORT_SYMBOL(register_wan_device); | 816 | EXPORT_SYMBOL(register_wan_device); |
814 | EXPORT_SYMBOL(unregister_wan_device); | 817 | EXPORT_SYMBOL(unregister_wan_device); |
815 | EXPORT_SYMBOL(wanrouter_encapsulate); | ||
816 | EXPORT_SYMBOL(wanrouter_type_trans); | ||
817 | EXPORT_SYMBOL(lock_adapter_irq); | ||
818 | EXPORT_SYMBOL(unlock_adapter_irq); | ||
819 | 818 | ||
820 | MODULE_LICENSE("GPL"); | 819 | MODULE_LICENSE("GPL"); |
821 | 820 | ||