diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-04-18 20:55:10 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-04-19 11:46:00 +0530 |
| commit | 25825bbd249db20d071f0adccc11104a9177af46 (patch) | |
| tree | 8c56e5e2ae8f7343145966d1c18c4560fd563d0d | |
| parent | 65fc6c50cecbb94d3c23a5dd74bc0548fd71655a (diff) | |
ANDROID: xt_qtaguid: Fix socket lookuplinaro-android-4.10
Upstream commit 8db4c5be88f6 ("netfilter: move socket lookup
infrastructure to nf_socket_ipv{4,6}.c")] moved socket lookup
to nf_socket_ipv{4,6}.c, hence use nf_sk_lookup_slow_v[4|6]()
instead of obsolete xt_socket_lookup_slow_v[4|6]().
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | include/uapi/linux/netfilter/xt_socket.h | 7 | ||||
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/uapi/linux/netfilter/xt_socket.h b/include/uapi/linux/netfilter/xt_socket.h index 7f00df6cd897..87644f832494 100644 --- a/include/uapi/linux/netfilter/xt_socket.h +++ b/include/uapi/linux/netfilter/xt_socket.h @@ -26,11 +26,4 @@ struct xt_socket_mtinfo3 { | XT_SOCKET_NOWILDCARD \ | XT_SOCKET_RESTORESKMARK) -struct sock *xt_socket_lookup_slow_v4(struct net *net, - const struct sk_buff *skb, - const struct net_device *indev); -struct sock *xt_socket_lookup_slow_v6(struct net *net, - const struct sk_buff *skb, - const struct net_device *indev); - #endif /* _XT_SOCKET_H */ diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 0f5628a59917..44db68bf2575 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1590,10 +1590,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, switch (par->family) { case NFPROTO_IPV6: - sk = xt_socket_lookup_slow_v6(dev_net(skb->dev), skb, par->in); + sk = nf_sk_lookup_slow_v6(dev_net(skb->dev), skb, par->in); break; case NFPROTO_IPV4: - sk = xt_socket_lookup_slow_v4(dev_net(skb->dev), skb, par->in); + sk = nf_sk_lookup_slow_v4(dev_net(skb->dev), skb, par->in); break; default: return NULL; |