Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index d084721db198d6fb5176b3f2cc12bad0b3df301c..a566944c4962cafd94cadb3c851767582dc4a430 100644 (file)
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -15,7 +15,7 @@
     GNU General Public License for more details.
 *******************************************************************************/
 
-extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri);
+extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
 extern int dn_route_output_sock(struct dst_entry **pprt, struct flowi *, struct sock *sk, int flags);
 extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
 extern int dn_cache_getroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
@@ -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);