diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-01-09 19:13:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-13 14:50:14 -0500 |
commit | ddafd34f419546f1eb7c343178685f059c3cf127 (patch) | |
tree | 56eacb6abe0c856904632e437baf6cef62cbb39c /net/sched/act_skbedit.c | |
parent | 600adc18eba823f9fd8ed5fec8b04f11dddf3884 (diff) |
net_sched: act: move idx_gen into struct tcf_hashinfo
There is no need to store the index separatedly
since tcf_hashinfo is allocated statically too.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_skbedit.c')
-rw-r--r-- | net/sched/act_skbedit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 0fa1aad6e204..74af46127060 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <net/tc_act/tc_skbedit.h> | 28 | #include <net/tc_act/tc_skbedit.h> |
29 | 29 | ||
30 | #define SKBEDIT_TAB_MASK 15 | 30 | #define SKBEDIT_TAB_MASK 15 |
31 | static u32 skbedit_idx_gen; | ||
32 | static struct tcf_hashinfo skbedit_hash_info; | 31 | static struct tcf_hashinfo skbedit_hash_info; |
33 | 32 | ||
34 | static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, | 33 | static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a, |
@@ -104,7 +103,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla, | |||
104 | pc = tcf_hash_check(parm->index, a, bind, &skbedit_hash_info); | 103 | pc = tcf_hash_check(parm->index, a, bind, &skbedit_hash_info); |
105 | if (!pc) { | 104 | if (!pc) { |
106 | pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind, | 105 | pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind, |
107 | &skbedit_idx_gen, &skbedit_hash_info); | 106 | &skbedit_hash_info); |
108 | if (IS_ERR(pc)) | 107 | if (IS_ERR(pc)) |
109 | return PTR_ERR(pc); | 108 | return PTR_ERR(pc); |
110 | 109 | ||