[NETFILTER]: Use nf_register_hooks for multiple registrations

[firefly-linux-kernel-4.4.55.git] / net / sched / sch_ingress.c

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 51f16b0af198deb9e7d3810b9b0024b65ab396e2..f4af9b604f3f09899e4789f10a6cc6d033b6309c 100644 (file)
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -158,9 +158,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                        break;
                case TC_ACT_RECLASSIFY:
                case TC_ACT_OK:
-               case TC_ACT_UNSPEC:
-               default:
                        skb->tc_index = TC_H_MIN(res.classid);
+               default:
                        result = TC_ACT_OK;
                        break;
        }
@@ -206,20 +205,19 @@ static unsigned int ingress_drop(struct Qdisc *sch)
 #ifndef CONFIG_NET_CLS_ACT
 #ifdef CONFIG_NETFILTER
 static unsigned int
-ing_hook(unsigned int hook, struct sk_buff **pskb,
+ing_hook(unsigned int hook, struct sk_buff *skb,
                             const struct net_device *indev,
                             const struct net_device *outdev,
                             int (*okfn)(struct sk_buff *))
 {
 
        struct Qdisc *q;
-       struct sk_buff *skb = *pskb;
        struct net_device *dev = skb->dev;
        int fwres=NF_ACCEPT;
 
        DPRINTK("ing_hook: skb %s dev=%s len=%u\n",
                skb->sk ? "(owned)" : "(unowned)",
-               skb->dev ? (*pskb)->dev->name : "(no dev)",
+               skb->dev ? skb->dev->name : "(no dev)",
                skb->len);
 
        if (dev->qdisc_ingress) {
@@ -233,20 +231,21 @@ ing_hook(unsigned int hook, struct sk_buff **pskb,
 }
 
 /* after ipt_filter */
-static struct nf_hook_ops ing_ops = {
-       .hook           = ing_hook,
-       .owner          = THIS_MODULE,
-       .pf             = PF_INET,
-       .hooknum        = NF_IP_PRE_ROUTING,
-       .priority       = NF_IP_PRI_FILTER + 1,
-};
-
-static struct nf_hook_ops ing6_ops = {
-       .hook           = ing_hook,
-       .owner          = THIS_MODULE,
-       .pf             = PF_INET6,
-       .hooknum        = NF_IP6_PRE_ROUTING,
-       .priority       = NF_IP6_PRI_FILTER + 1,
+static struct nf_hook_ops ing_ops[] = {
+       {
+               .hook           = ing_hook,
+               .owner          = THIS_MODULE,
+               .pf             = PF_INET,
+               .hooknum        = NF_INET_PRE_ROUTING,
+               .priority       = NF_IP_PRI_FILTER + 1,
+       },
+       {
+               .hook           = ing_hook,
+               .owner          = THIS_MODULE,
+               .pf             = PF_INET6,
+               .hooknum        = NF_INET_PRE_ROUTING,
+               .priority       = NF_IP6_PRI_FILTER + 1,
+       },
 };
 
 #endif
@@ -270,17 +269,11 @@ static int ingress_init(struct Qdisc *sch,struct rtattr *opt)
 #ifndef CONFIG_NET_CLS_ACT
 #ifdef CONFIG_NETFILTER
        if (!nf_registered) {
-               if (nf_register_hook(&ing_ops) < 0) {
+               if (nf_register_hooks(ing_ops, ARRAY_SIZE(ing_ops)) < 0) {
                        printk("ingress qdisc registration error \n");
                        return -EINVAL;
                }
                nf_registered++;
-
-               if (nf_register_hook(&ing6_ops) < 0) {
-                       printk("IPv6 ingress qdisc registration error, " \
-                           "disabling IPv6 support.\n");
-               } else
-                       nf_registered++;
        }
 #endif
 #endif
@@ -340,7 +333,7 @@ rtattr_failure:
        return -1;
 }
 
-static struct Qdisc_class_ops ingress_class_ops = {
+static const struct Qdisc_class_ops ingress_class_ops = {
        .graft          =       ingress_graft,
        .leaf           =       ingress_leaf,
        .get            =       ingress_get,
@@ -354,7 +347,7 @@ static struct Qdisc_class_ops ingress_class_ops = {
        .dump           =       NULL,
 };
 
-static struct Qdisc_ops ingress_qdisc_ops = {
+static struct Qdisc_ops ingress_qdisc_ops __read_mostly = {
        .next           =       NULL,
        .cl_ops         =       &ingress_class_ops,
        .id             =       "ingress",
@@ -387,11 +380,8 @@ static void __exit ingress_module_exit(void)
        unregister_qdisc(&ingress_qdisc_ops);
 #ifndef CONFIG_NET_CLS_ACT
 #ifdef CONFIG_NETFILTER
-       if (nf_registered) {
-               nf_unregister_hook(&ing_ops);
-               if (nf_registered > 1)
-                       nf_unregister_hook(&ing6_ops);
-       }
+       if (nf_registered)
+               nf_unregister_hooks(ing_ops, ARRAY_SIZE(ing_ops));
 #endif
 #endif
 }