Merge tag 'f2fs-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index 83969ee..d47ef4b 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -127,7 +127,6 @@ struct flowi6 {
 #define flowi6_oif             __fl_common.flowic_oif
 #define flowi6_iif             __fl_common.flowic_iif
 #define flowi6_mark            __fl_common.flowic_mark
-#define flowi6_tos             __fl_common.flowic_tos
 #define flowi6_scope           __fl_common.flowic_scope
 #define flowi6_proto           __fl_common.flowic_proto
 #define flowi6_flags           __fl_common.flowic_flags
@@ -135,6 +134,7 @@ struct flowi6 {
 #define flowi6_tun_key         __fl_common.flowic_tun_key
        struct in6_addr         daddr;
        struct in6_addr         saddr;
+       /* Note: flowi6_tos is encoded in flowlabel, too. */
        __be32                  flowlabel;
        union flowi_uli         uli;
 #define fl6_sport              uli.ports.sport