From c25d5918a2136c0e25c30aff84f5acb5242f5aff Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 20 Apr 2013 23:34:40 +0000 Subject: [PATCH] --- yaml --- r: 369350 b: refs/heads/master c: cf2c014adef10c75af7042f38e74adb91d7bff6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan_core.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9a0d4eddc6d8..5ebaecbd7ef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95a06161e6b903ad5b96285cb57c8df3b7c8ad34 +refs/heads/master: cf2c014adef10c75af7042f38e74adb91d7bff6c diff --git a/trunk/net/8021q/vlan_core.c b/trunk/net/8021q/vlan_core.c index ebfa2fceb88b..8a15eaadc4bd 100644 --- a/trunk/net/8021q/vlan_core.c +++ b/trunk/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)