Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / net / sched / cls_tcindex.c

diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 0323aee03de7efbb99c7943be078765c74dfdf2e..09b7dc5fe7e0a022e46947d18280901e37f40cf6 100644 (file)
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -365,7 +365,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
 
        err = tcindex_filter_result_init(&new_filter_result, net);
        if (err < 0)
-               goto errout1;
+               goto errout_alloc;
        if (old_r)
                cr = r->res;
 
@@ -484,7 +484,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
                tcindex_free_perfect_hash(cp);
        else if (balloc == 2)
                kfree(cp->h);
-errout1:
        tcf_exts_destroy(&new_filter_result.exts);
 errout:
        kfree(cp);