sata_promise: ASIC PRD table bug workaround, take 2

[linux-2.6-omap-h63xx.git] / include / net / protocol.h

diff --git a/include/net/protocol.h b/include/net/protocol.h
index c643bce64e552d0789facb53ebec5697e3ecd88b..1166ffb4b3ec7a253c640b680bbbd412718b1d48 100644 (file)
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -45,12 +45,12 @@ struct net_protocol {
 #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,
                               int type, int code, int offset,
-                              __u32 info);
+                              __be32 info);
 
        int     (*gso_send_check)(struct sk_buff *skb);
        struct sk_buff *(*gso_segment)(struct sk_buff *skb,
@@ -71,7 +71,7 @@ struct inet_protosw {
 
         /* These two fields form the lookup key.  */
        unsigned short   type;     /* This is the 2nd argument to socket(2). */
-       int              protocol; /* This is the L4 protocol number.  */
+       unsigned short   protocol; /* This is the L4 protocol number.  */
 
        struct proto     *prot;
        const struct proto_ops *ops;