Переглянути джерело

[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>
Patrick McHardy 17 роки тому
батько
коміт
b7a4a83629
2 змінених файлів з 2 додано та 4 видалено
  1. 0 2
      include/linux/if_vlan.h
  2. 2 2
      net/8021q/vlan.c

+ 0 - 2
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 */
 /* found in socket.c */
 extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
 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
 /* if this changes, algorithm will have to be reworked because this
  * depends on completely exhausting the VLAN identifier space.  Thus
  * depends on completely exhausting the VLAN identifier space.  Thus
  * it gives constant time look-up, but in many cases it wastes memory.
  * it gives constant time look-up, but in many cases it wastes memory.

+ 2 - 2
net/8021q/vlan.c

@@ -89,8 +89,8 @@ static int __init vlan_proto_init(void)
 	err = vlan_proc_init();
 	err = vlan_proc_init();
 	if (err < 0) {
 	if (err < 0) {
 		printk(KERN_ERR
 		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;
 		return err;
 	}
 	}