File update-kernel-headers-to-SLE12-SP1-Beta-1.patch of Package iproute2

From: Michal Kubecek <mkubecek@suse.cz>
Date: Tue, 11 Aug 2015 08:40:43 +0200
Subject: update kernel headers to SLE12-SP1 Beta 1
Patch-mainline: v3.15.0
Git-commit: fb876d89964443726aad57e3f68c0014a0fab6b5 (partial)
Git-commit: ec69a50cc8e41b3b7386cd4faadb0fb4c30dedb1 (partial)
Git-commit: bf9f122de3151f212db3bbe379ce72cd9363b184 (partial)
References: bsc#937086

---
 include/linux/if.h          | 1 +
 include/linux/pkt_sched.h   | 7 ++++---
 include/linux/tcp_metrics.h | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/linux/if.h b/include/linux/if.h
index 7f261c08e816..00babf0ef2dc 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -83,6 +83,7 @@
 #define IFF_SUPP_NOFCS	0x80000		/* device supports sending custom FCS */
 #define IFF_LIVE_ADDR_CHANGE 0x100000	/* device supports hardware address
 					 * change when it's running */
+#define IFF_MACVLAN 0x200000		/* Macvlan device */
 
 
 #define IF_GET_IFACE	0x0001		/* for querying only */
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 9b829134d422..66f925d3c07b 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -759,13 +759,14 @@ enum {
 
 	TCA_FQ_RATE_ENABLE,	/* enable/disable rate limiting */
 
-	TCA_FQ_FLOW_DEFAULT_RATE,/* for sockets with unspecified sk_rate,
-				  * use the following rate
-				  */
+	TCA_FQ_FLOW_DEFAULT_RATE,/* obsolete, do not use */
 
 	TCA_FQ_FLOW_MAX_RATE,	/* per flow max rate */
 
 	TCA_FQ_BUCKETS_LOG,	/* log2(number of buckets) */
+
+	TCA_FQ_FLOW_REFILL_DELAY,	/* flow credit refill delay in usec */
+
 	__TCA_FQ_MAX
 };
 
diff --git a/include/linux/tcp_metrics.h b/include/linux/tcp_metrics.h
index cb5157b55f32..8ff4b8fa53c1 100644
--- a/include/linux/tcp_metrics.h
+++ b/include/linux/tcp_metrics.h
@@ -11,12 +11,15 @@
 #define TCP_METRICS_GENL_VERSION	0x1
 
 enum tcp_metric_index {
-	TCP_METRIC_RTT,
-	TCP_METRIC_RTTVAR,
+	TCP_METRIC_RTT,		/* in ms units */
+	TCP_METRIC_RTTVAR,	/* in ms units */
 	TCP_METRIC_SSTHRESH,
 	TCP_METRIC_CWND,
 	TCP_METRIC_REORDERING,
 
+	TCP_METRIC_RTT_US,	/* in usec units */
+	TCP_METRIC_RTTVAR_US,	/* in usec units */
+
 	/* Always last.  */
 	__TCP_METRIC_MAX,
 };
-- 
2.4.7