X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnet%2Fprotocol.h;h=8d024d7cb7414727e5b9c512d0a23d827a3bfe49;hb=ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569;hp=105bf12b0c79588c6e45bf55239dc1bd6a1c27e2;hpb=9cdf083f981b8d37b3212400a359368661385099;p=linux-2.6

diff --git a/include/net/protocol.h b/include/net/protocol.h
index 105bf12b0c..8d024d7cb7 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -39,13 +39,14 @@ struct net_protocol {
 	int			(*gso_send_check)(struct sk_buff *skb);
 	struct sk_buff	       *(*gso_segment)(struct sk_buff *skb,
 					       int features);
-	int			no_policy;
+	unsigned int		no_policy:1,
+				netns_ok:1;
 };
 
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 struct inet6_protocol 
 {
-	int	(*handler)(struct sk_buff **skb);
+	int	(*handler)(struct sk_buff *skb);
 
 	void	(*err_handler)(struct sk_buff *skb,
 			       struct inet6_skb_parm *opt,
@@ -102,7 +103,7 @@ extern void	inet_unregister_protosw(struct inet_protosw *p);
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 extern int	inet6_add_protocol(struct inet6_protocol *prot, unsigned char num);
 extern int	inet6_del_protocol(struct inet6_protocol *prot, unsigned char num);
-extern void	inet6_register_protosw(struct inet_protosw *p);
+extern int	inet6_register_protosw(struct inet_protosw *p);
 extern void	inet6_unregister_protosw(struct inet_protosw *p);
 #endif