rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index e37cfda9c0ff5deda0298d0cf696ffa389a68fb1..c6d5fe5ec1bf4d788155e85b73d47e0e662dcf27 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -7,7 +7,6 @@
 #ifndef _NET_FLOW_H
 #define _NET_FLOW_H
 
-#include <linux/socket.h>
 #include <linux/in6.h>
 #include <asm/atomic.h>
 
@@ -69,7 +68,7 @@ struct flowi4 {
 #define fl4_ipsec_spi          uli.spi
 #define fl4_mh_type            uli.mht.type
 #define fl4_gre_key            uli.gre_key
-} __attribute__((__aligned__(BITS_PER_LONG/8)));
+};
 
 static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
                                      __u32 mark, __u8 tos, __u8 scope,
@@ -90,16 +89,6 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
        fl4->fl4_dport = dport;
        fl4->fl4_sport = sport;
 }
-
-/* Reset some input parameters after previous lookup */
-static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
-                                       __be32 daddr, __be32 saddr)
-{
-       fl4->flowi4_oif = oif;
-       fl4->flowi4_tos = tos;
-       fl4->daddr = daddr;
-       fl4->saddr = saddr;
-}
                                      
 
 struct flowi6 {
@@ -123,7 +112,7 @@ struct flowi6 {
 #define fl6_ipsec_spi          uli.spi
 #define fl6_mh_type            uli.mht.type
 #define fl6_gre_key            uli.gre_key
-} __attribute__((__aligned__(BITS_PER_LONG/8)));
+};
 
 struct flowidn {
        struct flowi_common     __fl_common;
@@ -138,7 +127,7 @@ struct flowidn {
        union flowi_uli         uli;
 #define fld_sport              uli.ports.sport
 #define fld_dport              uli.ports.dport
-} __attribute__((__aligned__(BITS_PER_LONG/8)));
+};
 
 struct flowi {
        union {
@@ -172,24 +161,6 @@ static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
        return container_of(fldn, struct flowi, u.dn);
 }
 
-typedef unsigned long flow_compare_t;
-
-static inline size_t flow_key_size(u16 family)
-{
-       switch (family) {
-       case AF_INET:
-               BUILD_BUG_ON(sizeof(struct flowi4) % sizeof(flow_compare_t));
-               return sizeof(struct flowi4) / sizeof(flow_compare_t);
-       case AF_INET6:
-               BUILD_BUG_ON(sizeof(struct flowi6) % sizeof(flow_compare_t));
-               return sizeof(struct flowi6) / sizeof(flow_compare_t);
-       case AF_DECnet:
-               BUILD_BUG_ON(sizeof(struct flowidn) % sizeof(flow_compare_t));
-               return sizeof(struct flowidn) / sizeof(flow_compare_t);
-       }
-       return 0;
-}
-
 #define FLOW_DIR_IN    0
 #define FLOW_DIR_OUT   1
 #define FLOW_DIR_FWD   2