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

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

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 4e5d2e9ace5de537e383f3781003041556b4c102..3397122961642f8dacc5f95a2c9e3dd4d6feddf0 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -221,12 +221,13 @@ static int tcf_dump_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
        struct idr *idr = &idrinfo->action_idr;
        struct tc_action *p;
        unsigned long id = 1;
+       unsigned long tmp;
 
        mutex_lock(&idrinfo->lock);
 
        s_i = cb->args[0];
 
-       idr_for_each_entry_ul(idr, p, id) {
+       idr_for_each_entry_ul(idr, p, tmp, id) {
                index++;
                if (index < s_i)
                        continue;
@@ -292,6 +293,7 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
        struct idr *idr = &idrinfo->action_idr;
        struct tc_action *p;
        unsigned long id = 1;
+       unsigned long tmp;
 
        nest = nla_nest_start_noflag(skb, 0);
        if (nest == NULL)
@@ -300,7 +302,7 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
                goto nla_put_failure;
 
        mutex_lock(&idrinfo->lock);
-       idr_for_each_entry_ul(idr, p, id) {
+       idr_for_each_entry_ul(idr, p, tmp, id) {
                ret = tcf_idr_release_unsafe(p);
                if (ret == ACT_P_DELETED) {
                        module_put(ops->owner);
@@ -533,8 +535,9 @@ void tcf_idrinfo_destroy(const struct tc_action_ops *ops,
        struct tc_action *p;
        int ret;
        unsigned long id = 1;
+       unsigned long tmp;
 
-       idr_for_each_entry_ul(idr, p, id) {
+       idr_for_each_entry_ul(idr, p, tmp, id) {
                ret = __tcf_idr_release(p, false, true);
                if (ret == ACT_P_DELETED)
                        module_put(ops->owner);