Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / include / net / dn_route.h

diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 5122da3f2eb35a9d8a59f01203067189956d239e..a566944c4962cafd94cadb3c851767582dc4a430 100644 (file)
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -68,20 +68,19 @@ extern void dn_rt_cache_flush(int delay);
 struct dn_route {
        union {
                struct dst_entry dst;
-               struct dn_route *rt_next;
        } u;
 
-       __u16 rt_saddr;
-       __u16 rt_daddr;
-       __u16 rt_gateway;
-       __u16 rt_local_src;     /* Source used for forwarding packets */
-       __u16 rt_src_map;
-       __u16 rt_dst_map;
+       struct flowi fl;
+
+       __le16 rt_saddr;
+       __le16 rt_daddr;
+       __le16 rt_gateway;
+       __le16 rt_local_src;    /* Source used for forwarding packets */
+       __le16 rt_src_map;
+       __le16 rt_dst_map;
 
        unsigned rt_flags;
        unsigned rt_type;
-
-       struct flowi fl;
 };
 
 extern void dn_route_init(void);