netfilter: Store net in nf_hook_state (b11b1f65) · Commits · e / devices / android_kernel_teracube_2e

include/linux/netfilter.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ struct nf_hook_state {
		struct net_device *in;
		struct net_device *out;
		struct sock *sk;
		struct net *net;
		struct list_head *hook_list;
		int (okfn)(struct sock , struct sk_buff *);
		};
		@@ -65,6 +66,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p,
		struct net_device *indev,
		struct net_device *outdev,
		struct sock *sk,
		struct net *net,
		int (okfn)(struct sock , struct sk_buff *))
		{
		p->hook = hook;
		@@ -73,6 +75,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p,
		p->in = indev;
		p->out = outdev;
		p->sk = sk;
		p->net = net;
		p->hook_list = hook_list;
		p->okfn = okfn;
		}
		@@ -181,7 +184,7 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
		struct nf_hook_state state;

		nf_hook_state_init(&state, hook_list, hook, thresh,
		pf, indev, outdev, sk, okfn);
		pf, indev, outdev, sk, net, okfn);
		return nf_hook_slow(skb, &state);
		}
		return 1;

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ static inline int nf_hook_ingress(struct sk_buff *skb)

		nf_hook_state_init(&state, &skb->dev->nf_hooks_ingress,
		NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV, NULL,
		skb->dev, NULL, NULL);
		skb->dev, NULL, dev_net(skb->dev), NULL);
		return nf_hook_slow(skb, &state);
		}