V4L/DVB (4210b): git-dvb: tea575x-tuner build fix

[linux-2.6] / include / net / protocol.h

diff --git a/include/net/protocol.h b/include/net/protocol.h
index 63f7db99c2a67c526dffd96a090621f5542e6765..3b6dc15c68a58fcd0c19996a4f058a1f6879588b 100644 (file)
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -24,7 +24,6 @@
 #ifndef _PROTOCOL_H
 #define _PROTOCOL_H
 
-#include <linux/config.h>
 #include <linux/in6.h>
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
@@ -37,13 +36,14 @@
 struct net_protocol {
        int                     (*handler)(struct sk_buff *skb);
        void                    (*err_handler)(struct sk_buff *skb, u32 info);
+       struct sk_buff         *(*gso_segment)(struct sk_buff *skb, int sg);
        int                     no_policy;
 };
 
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 struct inet6_protocol 
 {
-       int     (*handler)(struct sk_buff **skb, unsigned int *nhoffp);
+       int     (*handler)(struct sk_buff **skb);
 
        void    (*err_handler)(struct sk_buff *skb,
                               struct inet6_skb_parm *opt,