diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
| commit | f16180739cd18a39a1a45516ac0e65d18a9f100e (patch) | |
| tree | 22d1135650f8ddb25707c788cd4846c77b428ff0 /include/net | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| parent | e1e54ec7fb55501c33b117c111cb0a045b8eded2 (diff) | |
| download | kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.gz kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.bz2 kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.zip | |
Merge remote-tracking branch 'net/master' into afs-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/act_api.h | 4 | ||||
| -rw-r--r-- | include/net/psample.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index c61a1bf4e3de..3a1a72990fce 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -15,6 +15,7 @@ struct tcf_idrinfo { struct mutex lock; struct idr action_idr; + struct net *net; }; struct tc_action_ops; @@ -108,7 +109,7 @@ struct tc_action_net { }; static inline -int tc_action_net_init(struct tc_action_net *tn, +int tc_action_net_init(struct net *net, struct tc_action_net *tn, const struct tc_action_ops *ops) { int err = 0; @@ -117,6 +118,7 @@ int tc_action_net_init(struct tc_action_net *tn, if (!tn->idrinfo) return -ENOMEM; tn->ops = ops; + tn->idrinfo->net = net; mutex_init(&tn->idrinfo->lock); idr_init(&tn->idrinfo->action_idr); return err; diff --git a/include/net/psample.h b/include/net/psample.h index 37a4df2325b2..6b578ce69cd8 100644 --- a/include/net/psample.h +++ b/include/net/psample.h @@ -11,6 +11,7 @@ struct psample_group { u32 group_num; u32 refcount; u32 seq; + struct rcu_head rcu; }; struct psample_group *psample_group_get(struct net *net, u32 group_num); |