[VLAN]: Kill useless VLAN_NAME define

The only user already includes __FUNCTION__ (vlan_proto_init) in the
output, which is enough to identify what the message is about.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index a1b0066ec0d95b3cacbc8da1dc41ef6910550ed7..0325d6b17e07f64192284558b883c84af341bb8c 100644 (file)
--- 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)
 /* found in socket.c */
 extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
 
-#define VLAN_NAME "vlan"
-
 /* if this changes, algorithm will have to be reworked because this
  * depends on completely exhausting the VLAN identifier space.  Thus
  * 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 032bf44eca5e4e3cbbf39b825435f1f2cb573960..af252556942412dee22d7ba529fca4eaa6959dce 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -89,8 +89,8 @@ static int __init vlan_proto_init(void)
        err = vlan_proc_init();
        if (err < 0) {
                printk(KERN_ERR
-                      "%s %s: can't create entry in proc filesystem!\n",
-                      __FUNCTION__, VLAN_NAME);
+                      "%s: can't create entry in proc filesystem!\n",
+                      __FUNCTION__);
                return err;
        }