]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: sched: cls_u32: propagate extack support for filter offload
authorQuentin Monnet <quentin.monnet@netronome.com>
Sat, 20 Jan 2018 01:44:45 +0000 (17:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Jan 2018 21:28:23 +0000 (16:28 -0500)
Propagate the extack pointer from the `->change()` classifier operation
to the function used for filter replacement in cls_u32. This makes it
possible to use netlink extack messages in the future at replacement
time for this filter, although it is not used at this point.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_u32.c

index 57113e93615584d5bc747bc0aba6a1dceae0f5bf..0206c210e25b757a606a1bb7555d08d7d67de0aa 100644 (file)
@@ -501,7 +501,7 @@ static void u32_clear_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h)
 }
 
 static int u32_replace_hw_hnode(struct tcf_proto *tp, struct tc_u_hnode *h,
-                               u32 flags)
+                               u32 flags, struct netlink_ext_ack *extack)
 {
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_u32_offload cls_u32 = {};
@@ -543,7 +543,7 @@ static void u32_remove_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n)
 }
 
 static int u32_replace_hw_knode(struct tcf_proto *tp, struct tc_u_knode *n,
-                               u32 flags)
+                               u32 flags, struct netlink_ext_ack *extack)
 {
        struct tcf_block *block = tp->chain->block;
        struct tc_cls_u32_offload cls_u32 = {};
@@ -965,7 +965,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                        return err;
                }
 
-               err = u32_replace_hw_knode(tp, new, flags);
+               err = u32_replace_hw_knode(tp, new, flags, extack);
                if (err) {
                        u32_destroy_key(tp, new, false);
                        return err;
@@ -1016,7 +1016,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                ht->prio = tp->prio;
                idr_init(&ht->handle_idr);
 
-               err = u32_replace_hw_hnode(tp, ht, flags);
+               err = u32_replace_hw_hnode(tp, ht, flags, extack);
                if (err) {
                        idr_remove_ext(&tp_c->handle_idr, handle);
                        kfree(ht);
@@ -1122,7 +1122,7 @@ static int u32_change(struct net *net, struct sk_buff *in_skb,
                struct tc_u_knode __rcu **ins;
                struct tc_u_knode *pins;
 
-               err = u32_replace_hw_knode(tp, n, flags);
+               err = u32_replace_hw_knode(tp, n, flags, extack);
                if (err)
                        goto errhw;