net: Remove __KERNEL__ cpp checks from include/net

[linux-2.6-microblaze.git] / include / net / ipx.h

diff --git a/include/net/ipx.h b/include/net/ipx.h
index ef51a66..c1fec6b 100644 (file)
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -27,9 +27,9 @@ struct ipx_address {
 #define IPX_MAX_PPROP_HOPS 8
 
 struct ipxhdr {
-       __be16                  ipx_checksum __attribute__ ((packed));
+       __be16                  ipx_checksum __packed;
 #define IPX_NO_CHECKSUM        cpu_to_be16(0xFFFF)
-       __be16                  ipx_pktsize __attribute__ ((packed));
+       __be16                  ipx_pktsize __packed;
        __u8                    ipx_tctrl;
        __u8                    ipx_type;
 #define IPX_TYPE_UNKNOWN       0x00
@@ -38,8 +38,8 @@ struct ipxhdr {
 #define IPX_TYPE_SPX           0x05    /* SPX protocol */
 #define IPX_TYPE_NCP           0x11    /* $lots for docs on this (SPIT) */
 #define IPX_TYPE_PPROP         0x14    /* complicated flood fill brdcast */
-       struct ipx_address      ipx_dest __attribute__ ((packed));
-       struct ipx_address      ipx_source __attribute__ ((packed));
+       struct ipx_address      ipx_dest __packed;
+       struct ipx_address      ipx_source __packed;
 };
 
 static __inline__ struct ipxhdr *ipx_hdr(struct sk_buff *skb)
@@ -80,7 +80,6 @@ struct ipx_route {
        atomic_t                refcnt;
 };
 
-#ifdef __KERNEL__
 struct ipx_cb {
        u8      ipx_tctrl;
        __be32  ipx_dest_net;
@@ -116,7 +115,6 @@ static inline struct ipx_sock *ipx_sk(struct sock *sk)
 }
 
 #define IPX_SKB_CB(__skb) ((struct ipx_cb *)&((__skb)->cb[0]))
-#endif
 
 #define IPX_MIN_EPHEMERAL_SOCKET       0x4000
 #define IPX_MAX_EPHEMERAL_SOCKET       0x7fff