diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-11-20 14:45:40 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:51:41 -0800 |
| commit | af711d13fa59040b5f09b466c04c9299e27ba002 (patch) | |
| tree | 0a5e0b4385e1b314637bf512e16d542cd61bfc7c /net | |
| parent | 0e922fb48de57debfb0e3030f4391175833fb88d (diff) | |
netfilter: xt_qtaguid/socket: build fixes for 4.4
Update xt_socket_lookup_slow_v* usage in aosp patches, to
align with changes from mainline commit 686c9b50809d
"netfilter: x_tables: Use par->net instead of computing
from the passed net devices".
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 90b2c6aac7d8..62ddd6cd1ee8 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1589,10 +1589,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, switch (par->family) { case NFPROTO_IPV6: - sk = xt_socket_lookup_slow_v6(skb, par->in); + sk = xt_socket_lookup_slow_v6(dev_net(skb->dev), skb, par->in); break; case NFPROTO_IPV4: - sk = xt_socket_lookup_slow_v4(skb, par->in); + sk = xt_socket_lookup_slow_v4(dev_net(skb->dev), skb, par->in); break; default: return NULL; |