summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 09:19:16 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-29 00:08:25 +0100
commitb7a4a83629c1ddde8c2e6a872618c66577cb20f0 (patch)
treec32edd64012bf59e94e74ec39d20166899634de2
parent[VLAN]: Clean up vlan_hdr/vlan_ethhdr structs (diff)
downloadlinux-b7a4a83629c1ddde8c2e6a872618c66577cb20f0.tar.xz
linux-b7a4a83629c1ddde8c2e6a872618c66577cb20f0.zip
[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>
-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)
/* 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 032bf44eca5e..af2525569424 100644
--- 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;
}