flow_offload: fill flags to action structure

Fill flags to action structure to allow user control if
the action should be offloaded to hardware or not.

Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index f2bf896331a596a52366bd33a42041affc036c50..a77d8908e7372b2e069fefd963a577b2ceacf7ca 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -305,7 +305,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
        ret = tcf_idr_check_alloc(tn, &index, act, bind);
        if (!ret) {
                ret = tcf_idr_create(tn, index, est, act,
-                                    &act_bpf_ops, bind, true, 0);
+                                    &act_bpf_ops, bind, true, flags);
                if (ret < 0) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 94e78ac7a7487f4c3f0904c270f7c563db99ff6f..09e2aafc8943b04ed811f63b98fbae5f69ec5d05 100644 (file)
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -124,7 +124,7 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla,
        ret = tcf_idr_check_alloc(tn, &index, a, bind);
        if (!ret) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_connmark_ops, bind, false, 0);
+                                    &act_connmark_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_ctinfo.c b/net/sched/act_ctinfo.c
index 549374a2d0086dac3a371ec84748b6f4297207ac..0281e45987a471d731530d76c38c0ad2a85ddc44 100644 (file)
--- a/net/sched/act_ctinfo.c
+++ b/net/sched/act_ctinfo.c
@@ -212,7 +212,7 @@ static int tcf_ctinfo_init(struct net *net, struct nlattr *nla,
        err = tcf_idr_check_alloc(tn, &index, a, bind);
        if (!err) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_ctinfo_ops, bind, false, 0);
+                                    &act_ctinfo_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_gate.c b/net/sched/act_gate.c
index 7df72a4197a3fc98f504086e1d2697a5c5b911da..ac985c53ebafe4db2e40946dfef49cbb181cf683 100644 (file)
--- a/net/sched/act_gate.c
+++ b/net/sched/act_gate.c
@@ -357,7 +357,7 @@ static int tcf_gate_init(struct net *net, struct nlattr *nla,
 
        if (!err) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_gate_ops, bind, false, 0);
+                                    &act_gate_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index b757f90a2d5892eb23c0e2b8717911dc1bff5e58..41ba55e60b1bf153a2f42455f598e1f20aad4cab 100644 (file)
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -553,7 +553,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a, &act_ife_ops,
-                                    bind, true, 0);
+                                    bind, true, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        kfree(p);

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 265b1443e252f1bda87f92fb4652298ad4358157..2f3d507c24a1fbfcc242dc4ac21a0d12cf4b0a11 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -145,7 +145,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a, ops, bind,
-                                    false, 0);
+                                    false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
index 8faa4c58305e3f3cf331acc4b6e67403cfe1932d..2b30dc5627432f59c5ac94f5a7e6cee82373e7f7 100644 (file)
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
@@ -248,7 +248,7 @@ static int tcf_mpls_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_mpls_ops, bind, true, 0);
+                                    &act_mpls_ops, bind, true, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 7dd6b586ba7f680ee555c1e0d20abca3f9e4583f..2a39b3729e8449a45f0e1630e3102d85a8a52acf 100644 (file)
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -61,7 +61,7 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
        err = tcf_idr_check_alloc(tn, &index, a, bind);
        if (!err) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_nat_ops, bind, false, 0);
+                                    &act_nat_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index c6c862c459cc3b9220a96f5c6e6950b349e45fff..cd3b8aad3192cf1fd7f4b31b0f2add8cb41df69b 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -189,7 +189,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
        err = tcf_idr_check_alloc(tn, &index, a, bind);
        if (!err) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_pedit_ops, bind, false, 0);
+                                    &act_pedit_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        goto out_free;

diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 9e77ba8401e532d15efbc63e408d07976cfe8c08..c13a6245dfbab5c33d2401bf5bb3c6a8e55c232c 100644 (file)
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -90,7 +90,7 @@ static int tcf_police_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, NULL, a,
-                                    &act_police_ops, bind, true, 0);
+                                    &act_police_ops, bind, true, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
index ce859b0e0deb9d39692b3f6846b875f8f14cfbce..91a7a93d5f6ab8cd6a1de5bd4b08ca1e71a951be 100644 (file)
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
@@ -70,7 +70,7 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_sample_ops, bind, true, 0);
+                                    &act_sample_ops, bind, true, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index e617ab4505ca46b8118bd7edce12ccf8427ccdac..8c1d60bde93e09595bac51625b86e022e88afb58 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -129,7 +129,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_simp_ops, bind, false, 0);
+                                    &act_simp_ops, bind, false, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index d30ecbfc8f8463d0ae6b3682cf1cd202fe925280..f6df717b9f17535b8937f6e7111934ccae0ca280 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -176,7 +176,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_skbedit_ops, bind, true, 0);
+                                    &act_skbedit_ops, bind, true, act_flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;

diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index 9b6b52c5e24ec821c65ca8f3fe08bbb1edc74ea6..2083612d87803c2dd92f9124305f7b0e4fdaad4e 100644 (file)
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -168,7 +168,7 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
 
        if (!exists) {
                ret = tcf_idr_create(tn, index, est, a,
-                                    &act_skbmod_ops, bind, true, 0);
+                                    &act_skbmod_ops, bind, true, flags);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        return ret;