pandora: defconfig: update

[pandora-kernel.git] / net / sched / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index f2fb67e..943e1c5 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/kmod.h>
 #include <linux/err.h>
+#include <linux/module.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/sch_generic.h>
@@ -806,10 +807,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
                goto nla_put_failure;
 
        err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);
-       if (err < 0)
+       if (err <= 0)
                goto nla_put_failure;
-       if (err == 0)
-               goto noflush_out;
 
        nla_nest_end(skb, nest);
 
@@ -828,7 +827,6 @@ nla_put_failure:
 nlmsg_failure:
        module_put(a->ops->owner);
 err_out:
-noflush_out:
        kfree_skb(skb);
        kfree(a);
        return err;