diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2014-01-17 11:37:02 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-21 14:43:16 -0800 |
| commit | c779f7af99f73abb7270dcaa4c29178ab5ef7472 (patch) | |
| tree | 166e92b6b61aa2259c91e96fac1683ffe2fb8c13 /net/sched/act_csum.c | |
| parent | net: stmmac: fix NULL pointer dereference in stmmac_get_tx_hwtstamp (diff) | |
| download | linux-dev-c779f7af99f73abb7270dcaa4c29178ab5ef7472.tar.xz linux-dev-c779f7af99f73abb7270dcaa4c29178ab5ef7472.zip | |
net_sched: act: fetch hinfo from a->ops->hinfo
Every action ops has a pointer to hash info, so we don't need to
hard-code it in each module.
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_csum.c')
| -rw-r--r-- | net/sched/act_csum.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c index 9d5c1d343fe2..2210187c45c2 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c @@ -63,17 +63,16 @@ static int tcf_csum_init(struct net *n, struct nlattr *nla, struct nlattr *est, return -EINVAL; parm = nla_data(tb[TCA_CSUM_PARMS]); - pc = tcf_hash_check(parm->index, a, bind, &csum_hash_info); + pc = tcf_hash_check(parm->index, a, bind); if (!pc) { - pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind, - &csum_hash_info); + pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind); if (IS_ERR(pc)) return PTR_ERR(pc); ret = ACT_P_CREATED; } else { if (bind)/* dont override defaults */ return 0; - tcf_hash_release(pc, bind, &csum_hash_info); + tcf_hash_release(pc, bind, a->ops->hinfo); if (!ovr) return -EEXIST; } @@ -85,7 +84,7 @@ static int tcf_csum_init(struct net *n, struct nlattr *nla, struct nlattr *est, spin_unlock_bh(&p->tcf_lock); if (ret == ACT_P_CREATED) - tcf_hash_insert(pc, &csum_hash_info); + tcf_hash_insert(pc, a->ops->hinfo); return ret; } |