diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-03-30 13:13:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-03-30 13:13:05 -0800 |
| commit | f5d6da7d1edd0d380a3bad4d88c1901050e18bf1 (patch) | |
| tree | 20910d121c9c2b58491f0179f6479dc2444c7562 /include/net | |
| parent | b527eea4dc049bca0dd5d63de6555d8622965ba8 (diff) | |
| parent | e99122d248d5f22aa2466a53c29997386ac2865f (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/protocol.h | 1 | ||||
| -rw-r--r-- | include/net/sock.h | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/include/net/protocol.h b/include/net/protocol.h index f2b31f62312d..6f493c4a23cc 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h @@ -50,6 +50,7 @@ struct inet6_protocol struct inet6_skb_parm *opt, int type, int code, int offset, __u32 info); + int no_policy; }; #endif diff --git a/include/net/sock.h b/include/net/sock.h index df20f44552bf..6235779cc456 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -48,9 +48,7 @@ #include <linux/skbuff.h> /* struct sk_buff */ #include <linux/security.h> -#ifdef CONFIG_FILTER #include <linux/filter.h> -#endif #include <asm/atomic.h> #include <net/dst.h> @@ -174,10 +172,8 @@ struct sock { long rcvtimeo; long sndtimeo; -#ifdef CONFIG_FILTER /* Socket Filtering Instructions */ struct sk_filter *filter; -#endif /* CONFIG_FILTER */ /* This is where all the private (optional) areas that don't * overlap will eventually live. @@ -456,8 +452,6 @@ extern void sock_def_destruct(struct sock *); /* Initialise core socket variables */ extern void sock_init_data(struct socket *sock, struct sock *sk); -#ifdef CONFIG_FILTER - /** * __sk_filter - run a packet through a socket filter * @sk: sock associated with &sk_buff @@ -524,15 +518,6 @@ static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) atomic_add(sk_filter_len(fp), &sk->omem_alloc); } -#else - -static inline int __sk_filter(struct sock *sk, struct sk_buff *skb, int needlock) -{ - return 0; -} - -#endif /* CONFIG_FILTER */ - static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock) { int err; |