7 files changed, 47 insertions, 44 deletions

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index 9b30e62805c7..d30b23e42436 100644
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -147,7 +147,7 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act,
         struct tcf_t tm;
         int ret;
 
-        spin_lock(&prog->tcf_lock);
+        spin_lock_bh(&prog->tcf_lock);
         opt.action = prog->tcf_action;
         if (nla_put(skb, TCA_ACT_BPF_PARMS, sizeof(opt), &opt))
                 goto nla_put_failure;
@@ -164,11 +164,11 @@ static int tcf_bpf_dump(struct sk_buff *skb, struct tc_action *act,
                           TCA_ACT_BPF_PAD))
                 goto nla_put_failure;
 
-        spin_unlock(&prog->tcf_lock);
+        spin_unlock_bh(&prog->tcf_lock);
         return skb->len;
 
 nla_put_failure:
-        spin_unlock(&prog->tcf_lock);
+        spin_unlock_bh(&prog->tcf_lock);
         nlmsg_trim(skb, tp);
         return -1;
 }
@@ -340,7 +340,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 
         prog = to_bpf(*act);
 
-        spin_lock(&prog->tcf_lock);
+        spin_lock_bh(&prog->tcf_lock);
         if (res != ACT_P_CREATED)
                 tcf_bpf_prog_fill_cfg(prog, &old);
 
@@ -352,7 +352,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
 
         prog->tcf_action = parm->action;
         rcu_assign_pointer(prog->filter, cfg.filter);
-        spin_unlock(&prog->tcf_lock);
+        spin_unlock_bh(&prog->tcf_lock);
 
         if (res == ACT_P_CREATED) {
                 tcf_idr_insert(tn, *act);
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 5596fae4e478..e698d3fe2080 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -96,11 +96,11 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla,
         }
         params_new->update_flags = parm->update_flags;
 
-        spin_lock(&p->tcf_lock);
+        spin_lock_bh(&p->tcf_lock);
         p->tcf_action = parm->action;
         rcu_swap_protected(p->params, params_new,
                            lockdep_is_held(&p->tcf_lock));
-        spin_unlock(&p->tcf_lock);
+        spin_unlock_bh(&p->tcf_lock);
 
         if (params_new)
                 kfree_rcu(params_new, rcu);
@@ -604,7 +604,7 @@ static int tcf_csum_dump(struct sk_buff *skb, struct tc_action *a, int bind,
         };
         struct tcf_t t;
 
-        spin_lock(&p->tcf_lock);
+        spin_lock_bh(&p->tcf_lock);
         params = rcu_dereference_protected(p->params,
                                            lockdep_is_held(&p->tcf_lock));
         opt.action = p->tcf_action;
@@ -616,12 +616,12 @@ static int tcf_csum_dump(struct sk_buff *skb, struct tc_action *a, int bind,
         tcf_tm_dump(&t, &p->tcf_tm);
         if (nla_put_64bit(skb, TCA_CSUM_TM, sizeof(t), &t, TCA_CSUM_PAD))
                 goto nla_put_failure;
-        spin_unlock(&p->tcf_lock);
+        spin_unlock_bh(&p->tcf_lock);
 
         return skb->len;
 
 nla_put_failure:
-        spin_unlock(&p->tcf_lock);
+        spin_unlock_bh(&p->tcf_lock);
         nlmsg_trim(skb, b);
         return -1;
 }
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 52a3e474d822..6a3f25a8ffb3 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -113,7 +113,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
 
         gact = to_gact(*a);
 
-        spin_lock(&gact->tcf_lock);
+        spin_lock_bh(&gact->tcf_lock);
         gact->tcf_action = parm->action;
 #ifdef CONFIG_GACT_PROB
         if (p_parm) {
@@ -126,7 +126,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
                 gact->tcfg_ptype   = p_parm->ptype;
         }
 #endif
-        spin_unlock(&gact->tcf_lock);
+        spin_unlock_bh(&gact->tcf_lock);
 
         if (ret == ACT_P_CREATED)
                 tcf_idr_insert(tn, *a);
@@ -183,7 +183,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,
         };
         struct tcf_t t;
 
-        spin_lock(&gact->tcf_lock);
+        spin_lock_bh(&gact->tcf_lock);
         opt.action = gact->tcf_action;
         if (nla_put(skb, TCA_GACT_PARMS, sizeof(opt), &opt))
                 goto nla_put_failure;
@@ -202,12 +202,12 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a,
         tcf_tm_dump(&t, &gact->tcf_tm);
         if (nla_put_64bit(skb, TCA_GACT_TM, sizeof(t), &t, TCA_GACT_PAD))
                 goto nla_put_failure;
-        spin_unlock(&gact->tcf_lock);
+        spin_unlock_bh(&gact->tcf_lock);
 
         return skb->len;
 
 nla_put_failure:
-        spin_unlock(&gact->tcf_lock);
+        spin_unlock_bh(&gact->tcf_lock);
         nlmsg_trim(skb, b);
         return -1;
 }
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 8ec216001077..38fd20f10f67 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -159,14 +159,14 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
         }
         m = to_mirred(*a);
 
-        spin_lock(&m->tcf_lock);
+        spin_lock_bh(&m->tcf_lock);
         m->tcf_action = parm->action;
         m->tcfm_eaction = parm->eaction;
 
         if (parm->ifindex) {
                 dev = dev_get_by_index(net, parm->ifindex);
                 if (!dev) {
-                        spin_unlock(&m->tcf_lock);
+                        spin_unlock_bh(&m->tcf_lock);
                         tcf_idr_release(*a, bind);
                         return -ENODEV;
                 }
@@ -177,7 +177,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                         dev_put(dev);
                 m->tcfm_mac_header_xmit = mac_header_xmit;
         }
-        spin_unlock(&m->tcf_lock);
+        spin_unlock_bh(&m->tcf_lock);
 
         if (ret == ACT_P_CREATED) {
                 spin_lock(&mirred_list_lock);
@@ -305,7 +305,7 @@ static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind,
         struct net_device *dev;
         struct tcf_t t;
 
-        spin_lock(&m->tcf_lock);
+        spin_lock_bh(&m->tcf_lock);
         opt.action = m->tcf_action;
         opt.eaction = m->tcfm_eaction;
         dev = tcf_mirred_dev_dereference(m);
@@ -318,12 +318,12 @@ static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind,
         tcf_tm_dump(&t, &m->tcf_tm);
         if (nla_put_64bit(skb, TCA_MIRRED_TM, sizeof(t), &t, TCA_MIRRED_PAD))