Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux...

[linux-beck.git] / net / openvswitch / flow.h

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 1d055c559eafb118043ed21c66916d7313c41d8d..03378e75a67c0807b5a362a5ca95cf13cfee3917 100644 (file)
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -55,7 +55,7 @@ struct ovs_tunnel_info {
        FIELD_SIZEOF(struct sw_flow_key, recirc_id))
 
 struct sw_flow_key {
-       u8 tun_opts[255];
+       u8 tun_opts[IP_TUNNEL_OPTS_MAX];
        u8 tun_opts_len;
        struct ip_tunnel_key tun_key;   /* Encapsulating tunnel key. */
        struct {