summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlanproc.c3
-rw-r--r--net/8021q/vlanproc.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index ae63cf72a953..5f1446c9f098 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -184,12 +184,11 @@ int vlan_proc_add_dev(struct net_device *vlandev)
184/* 184/*
185 * Delete directory entry for VLAN device. 185 * Delete directory entry for VLAN device.
186 */ 186 */
187int vlan_proc_rem_dev(struct net_device *vlandev) 187void vlan_proc_rem_dev(struct net_device *vlandev)
188{ 188{
189 /** NOTE: This will consume the memory pointed to by dent, it seems. */ 189 /** NOTE: This will consume the memory pointed to by dent, it seems. */
190 proc_remove(vlan_dev_priv(vlandev)->dent); 190 proc_remove(vlan_dev_priv(vlandev)->dent);
191 vlan_dev_priv(vlandev)->dent = NULL; 191 vlan_dev_priv(vlandev)->dent = NULL;
192 return 0;
193} 192}
194 193
195/****** Proc filesystem entry points ****************************************/ 194/****** Proc filesystem entry points ****************************************/
diff --git a/net/8021q/vlanproc.h b/net/8021q/vlanproc.h
index 063f60a3d5cc..8838a2e92eb6 100644
--- a/net/8021q/vlanproc.h
+++ b/net/8021q/vlanproc.h
@@ -5,7 +5,7 @@
5struct net; 5struct net;
6 6
7int vlan_proc_init(struct net *net); 7int vlan_proc_init(struct net *net);
8int vlan_proc_rem_dev(struct net_device *vlandev); 8void vlan_proc_rem_dev(struct net_device *vlandev);
9int vlan_proc_add_dev(struct net_device *vlandev); 9int vlan_proc_add_dev(struct net_device *vlandev);
10void vlan_proc_cleanup(struct net *net); 10void vlan_proc_cleanup(struct net *net);
11 11
@@ -14,7 +14,7 @@ void vlan_proc_cleanup(struct net *net);
14#define vlan_proc_init(net) (0) 14#define vlan_proc_init(net) (0)
15#define vlan_proc_cleanup(net) do {} while (0) 15#define vlan_proc_cleanup(net) do {} while (0)
16#define vlan_proc_add_dev(dev) ({(void)(dev), 0; }) 16#define vlan_proc_add_dev(dev) ({(void)(dev), 0; })
17#define vlan_proc_rem_dev(dev) ({(void)(dev), 0; }) 17#define vlan_proc_rem_dev(dev) do {} while (0)
18#endif 18#endif
19 19
20#endif /* !(__BEN_VLAN_PROC_INC__) */ 20#endif /* !(__BEN_VLAN_PROC_INC__) */