Merge branch 'master' into for-linus

[safe/jmp/linux-2.6] / include / net / ipx.h

diff --git a/include/net/ipx.h b/include/net/ipx.h
index c6b2ee6..ef51a66 100644 (file)
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -13,6 +13,7 @@
 #include <net/datalink.h>
 #include <linux/ipx.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 
 struct ipx_address {
        __be32  net;
@@ -27,7 +28,7 @@ struct ipx_address {
 
 struct ipxhdr {
        __be16                  ipx_checksum __attribute__ ((packed));
-#define IPX_NO_CHECKSUM        __constant_htons(0xFFFF)
+#define IPX_NO_CHECKSUM        cpu_to_be16(0xFFFF)
        __be16                  ipx_pktsize __attribute__ ((packed));
        __u8                    ipx_tctrl;
        __u8                    ipx_type;
@@ -43,7 +44,7 @@ struct ipxhdr {
 
 static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
 {
-       return (struct ipxhdr *)skb->h.raw;
+       return (struct ipxhdr *)skb_transport_header(skb);
 }
 
 struct ipx_interface {