github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: netfilter: xt_qtaguid: xt_socket: build fixes

Browse Source 
Add missing header <linux/miscdevice.h> and use
xt_socket_lookup_slow_v* instead of xt_socket_get*_sk
in xt_qtaguid.c.

Fix xt_socket_lookup_slow_v* functions in xt_socket.c
and declare them in xt_socket.h

Change-Id: I55819b2d4ffa82a2be20995c87d28fb5cc77b5ba
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
Amit Pundir 2015-07-07 00:28:49 +05:30 committed by Dmitry Shmidt
parent 20e85a2043
commit 6e2b405681
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/uapi/linux/netfilter/xt_socket.h
View File

@ -26,9 +26,9 @@ struct xt_socket_mtinfo3 {
| XT_SOCKET_NOWILDCARD \
| XT_SOCKET_RESTORESKMARK)
struct sock *xt_socket_get4_sk(const struct sk_buff *skb,
struct xt_action_param *par);
struct sock *xt_socket_get6_sk(const struct sk_buff *skb,
struct xt_action_param *par);
struct sock *xt_socket_lookup_slow_v4(const struct sk_buff *skb,
const struct net_device *indev);
struct sock *xt_socket_lookup_slow_v6(const struct sk_buff *skb,
const struct net_device *indev);
#endif /* _XT_SOCKET_H */

5
net/netfilter/xt_qtaguid.c
View File

@ -17,6 +17,7 @@
#include <linux/file.h>
#include <linux/inetdevice.h>
#include <linux/module.h>
#include <linux/miscdevice.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_qtaguid.h>
#include <linux/ratelimit.h>
@ -1588,10 +1589,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb,
switch (par->family) {
case NFPROTO_IPV6:
sk = xt_socket_get6_sk(skb, par);
sk = xt_socket_lookup_slow_v6(skb, par->in);
break;
case NFPROTO_IPV4:
sk = xt_socket_get4_sk(skb, par);
sk = xt_socket_lookup_slow_v4(skb, par->in);
break;
default:
return NULL;