aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/if_vlan.h2
-rw-r--r--net/8021q/vlan.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index a1b0066ec0d9..0325d6b17e07 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -72,8 +72,6 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
72/* found in socket.c */ 72/* found in socket.c */
73extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *)); 73extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
74 74
75#define VLAN_NAME "vlan"
76
77/* if this changes, algorithm will have to be reworked because this 75/* if this changes, algorithm will have to be reworked because this
78 * depends on completely exhausting the VLAN identifier space. Thus 76 * depends on completely exhausting the VLAN identifier space. Thus
79 * it gives constant time look-up, but in many cases it wastes memory. 77 * it gives constant time look-up, but in many cases it wastes memory.
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 032bf44eca5e..af2525569424 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -89,8 +89,8 @@ static int __init vlan_proto_init(void)
89 err = vlan_proc_init(); 89 err = vlan_proc_init();
90 if (err < 0) { 90 if (err < 0) {
91 printk(KERN_ERR 91 printk(KERN_ERR
92 "%s %s: can't create entry in proc filesystem!\n", 92 "%s: can't create entry in proc filesystem!\n",
93 __FUNCTION__, VLAN_NAME); 93 __FUNCTION__);
94 return err; 94 return err;
95 } 95 }
96 96