From f3afddc68a9c707d0e790e9bc682ba863421461d Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:19:16 -0800 Subject: [PATCH] --- yaml --- r: 79300 b: refs/heads/master c: b7a4a83629c1ddde8c2e6a872618c66577cb20f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/if_vlan.h | 2 -- trunk/net/8021q/vlan.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9570de3edbc6..18a07e9c5db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 740c15d0dd281c0cbe1a9ab1abc4f332e0df29bc +refs/heads/master: b7a4a83629c1ddde8c2e6a872618c66577cb20f0 diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h index a1b0066ec0d9..0325d6b17e07 100644 --- a/trunk/include/linux/if_vlan.h +++ b/trunk/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/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index 032bf44eca5e..af2525569424 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/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; }