update kernel headers to 3.13-rc1

diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 1f85a27697733893ed7d9475672f36b06b865964..d48123a13ea703d5bd7c94ffd5a10ffc5c7375ba 100644 (file)
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -27,6 +27,7 @@ struct genlmsghdr {
  */
 #define GENL_ID_GENERATE       0
 #define GENL_ID_CTRL           NLMSG_MIN_TYPE
+#define GENL_ID_VFS_DQUOT      (NLMSG_MIN_TYPE + 1)
 
 /**************************************************************************
  * Controller

diff --git a/include/linux/if.h b/include/linux/if.h
index 7f261c08e8160db52b6d8993240392fcfa55502c..00babf0ef2dc0fd4f2aa0f82a49cbafeebf45b98 100644 (file)
--- 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/if_ether.h b/include/linux/if_ether.h
index 2fc760ac35f4fb55ccb35bfd046b810d7db6b568..06437c0e792a3c7695ad5ff59b783544e6107cd8 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -85,6 +85,7 @@
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_MVRP     0x88F5          /* 802.1Q MVRP                  */
 #define ETH_P_1588     0x88F7          /* IEEE 1588 Timesync */
+#define ETH_P_PRP      0x88FB          /* IEC 62439-3 PRP/HSRv0        */
 #define ETH_P_FCOE     0x8906          /* Fibre Channel over Ethernet  */
 #define ETH_P_TDLS     0x890D          /* TDLS */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index a485920f59af1ef9f2d36a0428a7926b669b3582..93654e7ad87b6f43a5423110e11af0cd3bc0f2a0 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -479,4 +479,17 @@ enum {
 
 #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
 
+
+/* HSR section */
+
+enum {
+       IFLA_HSR_UNSPEC,
+       IFLA_HSR_SLAVE1,
+       IFLA_HSR_SLAVE2,
+       IFLA_HSR_MULTICAST_SPEC,
+       __IFLA_HSR_MAX,
+};
+
+#define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index f2624b549e6187155c2f6677d308b2bfc3e60acd..a806687ad98fc1258ae0b36c75164ecf5d59eec4 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -171,6 +171,8 @@ enum {
        TCA_TBF_PARMS,
        TCA_TBF_RTAB,
        TCA_TBF_PTAB,
+       TCA_TBF_RATE64,
+       TCA_TBF_PRATE64,
        __TCA_TBF_MAX,
 };
 
@@ -761,13 +763,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
 };