fs: Remove ->readpages address space operation

[linux-2.6-microblaze.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index 58beb16..987bd51 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -29,6 +29,7 @@ struct flowi_tunnel {
 struct flowi_common {
        int     flowic_oif;
        int     flowic_iif;
+       int     flowic_l3mdev;
        __u32   flowic_mark;
        __u8    flowic_tos;
        __u8    flowic_scope;
@@ -36,7 +37,6 @@ struct flowi_common {
        __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC              0x01
 #define FLOWI_FLAG_KNOWN_NH            0x02
-#define FLOWI_FLAG_SKIP_NH_OIF         0x04
        __u32   flowic_secid;
        kuid_t  flowic_uid;
        struct flowi_tunnel flowic_tun_key;
@@ -70,6 +70,7 @@ struct flowi4 {
        struct flowi_common     __fl_common;
 #define flowi4_oif             __fl_common.flowic_oif
 #define flowi4_iif             __fl_common.flowic_iif
+#define flowi4_l3mdev          __fl_common.flowic_l3mdev
 #define flowi4_mark            __fl_common.flowic_mark
 #define flowi4_tos             __fl_common.flowic_tos
 #define flowi4_scope           __fl_common.flowic_scope
@@ -102,6 +103,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
 {
        fl4->flowi4_oif = oif;
        fl4->flowi4_iif = LOOPBACK_IFINDEX;
+       fl4->flowi4_l3mdev = 0;
        fl4->flowi4_mark = mark;
        fl4->flowi4_tos = tos;
        fl4->flowi4_scope = scope;
@@ -132,6 +134,7 @@ struct flowi6 {
        struct flowi_common     __fl_common;
 #define flowi6_oif             __fl_common.flowic_oif
 #define flowi6_iif             __fl_common.flowic_iif
+#define flowi6_l3mdev          __fl_common.flowic_l3mdev
 #define flowi6_mark            __fl_common.flowic_mark
 #define flowi6_scope           __fl_common.flowic_scope
 #define flowi6_proto           __fl_common.flowic_proto
@@ -177,6 +180,7 @@ struct flowi {
        } u;
 #define flowi_oif      u.__fl_common.flowic_oif
 #define flowi_iif      u.__fl_common.flowic_iif
+#define flowi_l3mdev   u.__fl_common.flowic_l3mdev
 #define flowi_mark     u.__fl_common.flowic_mark
 #define flowi_tos      u.__fl_common.flowic_tos
 #define flowi_scope    u.__fl_common.flowic_scope