Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / include / net / dn_neigh.h

diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h
index 4b1eb038d6377119b15a8ef8c55b90caa4e3c07b..4cb4ae7fb81fddc3915402e26b90a4ba8ac28c78 100644 (file)
--- a/include/net/dn_neigh.h
+++ b/include/net/dn_neigh.h
@@ -7,13 +7,13 @@
  */
 struct dn_neigh {
         struct neighbour n;
-       dn_address addr;
+       __le16 addr;
         unsigned long flags;
 #define DN_NDFLAG_R1    0x0001 /* Router L1      */
 #define DN_NDFLAG_R2    0x0002 /* Router L2      */
 #define DN_NDFLAG_P3    0x0004 /* Phase III Node */
         unsigned long blksize;
-       unsigned char priority;
+       __u8 priority;
 };
 
 extern void dn_neigh_init(void);