net: sched: act: move global static variable net_id to tc_action_ops

[linux-2.6-microblaze.git] / net / sched / act_bpf.c

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index fea2d78..dd839ef 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -29,7 +29,6 @@ struct tcf_bpf_cfg {
        bool is_ebpf;
 };
 
-static unsigned int bpf_net_id;
 static struct tc_action_ops act_bpf_ops;
 
 static int tcf_bpf_act(struct sk_buff *skb, const struct tc_action *act,
@@ -280,7 +279,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
                        struct tcf_proto *tp, u32 flags,
                        struct netlink_ext_ack *extack)
 {
-       struct tc_action_net *tn = net_generic(net, bpf_net_id);
+       struct tc_action_net *tn = net_generic(net, act_bpf_ops.net_id);
        bool bind = flags & TCA_ACT_FLAGS_BIND;
        struct nlattr *tb[TCA_ACT_BPF_MAX + 1];
        struct tcf_chain *goto_ch = NULL;
@@ -395,14 +394,14 @@ static int tcf_bpf_walker(struct net *net, struct sk_buff *skb,
                          const struct tc_action_ops *ops,
                          struct netlink_ext_ack *extack)
 {
-       struct tc_action_net *tn = net_generic(net, bpf_net_id);
+       struct tc_action_net *tn = net_generic(net, act_bpf_ops.net_id);
 
        return tcf_generic_walker(tn, skb, cb, type, ops, extack);
 }
 
 static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index)
 {
-       struct tc_action_net *tn = net_generic(net, bpf_net_id);
+       struct tc_action_net *tn = net_generic(net, act_bpf_ops.net_id);
 
        return tcf_idr_search(tn, a, index);
 }
@@ -422,20 +421,20 @@ static struct tc_action_ops act_bpf_ops __read_mostly = {
 
 static __net_init int bpf_init_net(struct net *net)
 {
-       struct tc_action_net *tn = net_generic(net, bpf_net_id);
+       struct tc_action_net *tn = net_generic(net, act_bpf_ops.net_id);
 
        return tc_action_net_init(net, tn, &act_bpf_ops);
 }
 
 static void __net_exit bpf_exit_net(struct list_head *net_list)
 {
-       tc_action_net_exit(net_list, bpf_net_id);
+       tc_action_net_exit(net_list, act_bpf_ops.net_id);
 }
 
 static struct pernet_operations bpf_net_ops = {
        .init = bpf_init_net,
        .exit_batch = bpf_exit_net,
-       .id   = &bpf_net_id,
+       .id   = &act_bpf_ops.net_id,
        .size = sizeof(struct tc_action_net),
 };