Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index bb08692a20b08841ead94acce78c9ead82293d94..240b7f356c7105c5ded9baa91c6c41cbdbc85261 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -66,6 +66,7 @@ struct flowi {
                } dnports;
 
                __be32          spi;
+               __be32          gre_key;
 
                struct {
                        __u8    type;
@@ -77,6 +78,7 @@ struct flowi {
 #define fl_icmp_code   uli_u.icmpt.code
 #define fl_ipsec_spi   uli_u.spi
 #define fl_mh_type     uli_u.mht.type
+#define fl_gre_key     uli_u.gre_key
        __u32           secid;  /* used by xfrm; see secid.txt */
 } __attribute__((__aligned__(BITS_PER_LONG/8)));