[IPV6]: flowlabels are net-endian

[net-next-2.6.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index ddf5f3ca1720154be67aca197f628f1e7a83fd08..270d4c1761af478badd4da3e86bc590ccf9ae773 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -27,7 +27,7 @@ struct flowi {
                        struct in6_addr         daddr;
                        struct in6_addr         saddr;
                        __u32                   fwmark;
-                       __u32                   flowlabel;
+                       __be32                  flowlabel;
                } ip6_u;
 
                struct {
@@ -68,9 +68,6 @@ struct flowi {
                struct {
                        __le16  sport;
                        __le16  dport;
-                       __u8    objnum;
-                       __u8    objnamel; /* Not 16 bits since max val is 16 */
-                       __u8    objname[16]; /* Not zero terminated */
                } dnports;
 
                __be32          spi;
@@ -97,7 +94,7 @@ struct flowi {
 #define FLOW_DIR_FWD   2
 
 struct sock;
-typedef void (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
+typedef int (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
                               void **objp, atomic_t **obj_refp);
 
 extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,