Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / 8021q / vlan_core.c

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index ebfa2fceb88b4f51f9a58bc2a80e6d7cb1241794..8a15eaadc4bd655c9969b0b19197a424d79aaa36 100644 (file)
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -157,10 +157,11 @@ EXPORT_SYMBOL(vlan_untag);
 
 static void vlan_group_free(struct vlan_group *grp)
 {
-       int i;
+       int i, j;
 
-       for (i = 0; i < VLAN_GROUP_ARRAY_SPLIT_PARTS; i++)
-               kfree(grp->vlan_devices_arrays[i]);
+       for (i = 0; i < VLAN_PROTO_NUM; i++)
+               for (j = 0; j < VLAN_GROUP_ARRAY_SPLIT_PARTS; j++)
+                       kfree(grp->vlan_devices_arrays[i][j]);
 }
 
 static void vlan_info_free(struct vlan_info *vlan_info)