Merge tag 'v3.13' into for-3.15

Linux 3.13

Conflicts:
	include/net/xfrm.h

Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.

1 files changed, 15 insertions, 3 deletions

diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index a74d375b439b..d120f9fe0017 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -63,15 +63,18 @@ enum ovs_datapath_cmd {
  * not be sent.
  * @OVS_DP_ATTR_STATS: Statistics about packets that have passed through the
  * datapath.  Always present in notifications.
+ * @OVS_DP_ATTR_MEGAFLOW_STATS: Statistics about mega flow masks usage for the
+ * datapath. Always present in notifications.
  *
  * These attributes follow the &struct ovs_header within the Generic Netlink
  * payload for %OVS_DP_* commands.
  */
 enum ovs_datapath_attr {
         OVS_DP_ATTR_UNSPEC,
-        OVS_DP_ATTR_NAME,       /* name of dp_ifindex netdev */
-        OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */
-        OVS_DP_ATTR_STATS,      /* struct ovs_dp_stats */
+        OVS_DP_ATTR_NAME,               /* name of dp_ifindex netdev */
+        OVS_DP_ATTR_UPCALL_PID,         /* Netlink PID to receive upcalls */
+        OVS_DP_ATTR_STATS,              /* struct ovs_dp_stats */
+        OVS_DP_ATTR_MEGAFLOW_STATS,     /* struct ovs_dp_megaflow_stats */
         __OVS_DP_ATTR_MAX
 };
 
@@ -84,6 +87,14 @@ struct ovs_dp_stats {
         __u64 n_flows;           /* Number of flows present */
 };
 
+struct ovs_dp_megaflow_stats {
+        __u64 n_mask_hit;        /* Number of masks used for flow lookups. */
+        __u32 n_masks;           /* Number of masks for the datapath. */
+        __u32 pad0;              /* Pad for future expension. */
+        __u64 pad1;              /* Pad for future expension. */
+        __u64 pad2;              /* Pad for future expension. */
+};
+
 struct ovs_vport_stats {
         __u64   rx_packets;             /* total packets received       */
         __u64   tx_packets;             /* total packets transmitted    */
@@ -260,6 +271,7 @@ enum ovs_key_attr {
         OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */
         OVS_KEY_ATTR_TUNNEL,    /* Nested set of ovs_tunnel attributes */
         OVS_KEY_ATTR_SCTP,      /* struct ovs_key_sctp */
+        OVS_KEY_ATTR_TCP_FLAGS, /* be16 TCP flags. */
 
 #ifdef __KERNEL__
         OVS_KEY_ATTR_IPV4_TUNNEL,  /* struct ovs_key_ipv4_tunnel */