Merge tag 'iommu-updates-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[karo-tx-linux.git] / net / 8021q / vlanproc.c

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index ae63cf72a953ca0f733b7b9e8cfb61dc9012da3c..5f1446c9f09813c3a05e4e0f01b6861f83d01535 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -184,12 +184,11 @@ int vlan_proc_add_dev(struct net_device *vlandev)
 /*
  *     Delete directory entry for VLAN device.
  */
-int vlan_proc_rem_dev(struct net_device *vlandev)
+void vlan_proc_rem_dev(struct net_device *vlandev)
 {
        /** NOTE:  This will consume the memory pointed to by dent, it seems. */
        proc_remove(vlan_dev_priv(vlandev)->dent);
        vlan_dev_priv(vlandev)->dent = NULL;
-       return 0;
 }
 
 /****** Proc filesystem entry points ****************************************/