Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

[linux-2.6-block.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index ab6761a7c883a756583f570dc861af1e1d30e67f..bf264a8db1ce3b1b29b9a5cc9732df323154e7e5 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -263,11 +263,21 @@ static inline bool sysctl_dev_name_is_allowed(const char *name)
        return strcmp(name, "default") != 0  && strcmp(name, "all") != 0;
 }
 
+static inline int inet_prot_sock(struct net *net)
+{
+       return net->ipv4.sysctl_ip_prot_sock;
+}
+
 #else
 static inline int inet_is_local_reserved_port(struct net *net, int port)
 {
        return 0;
 }
+
+static inline int inet_prot_sock(struct net *net)
+{
+       return PROT_SOCK;
+}
 #endif
 
 __be32 inet_current_timestamp(void);