update to net-next headers

diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index d48123a13ea703d5bd7c94ffd5a10ffc5c7375ba..1f85a27697733893ed7d9475672f36b06b865964 100644 (file)
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -27,7 +27,6 @@ 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/pkt_sched.h b/include/linux/pkt_sched.h
index a806687ad98fc1258ae0b36c75164ecf5d59eec4..307f293477e83684970fc5c6dc05225d750d0882 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -763,14 +763,13 @@ enum {
 
        TCA_FQ_RATE_ENABLE,     /* enable/disable rate limiting */
 
-       TCA_FQ_FLOW_DEFAULT_RATE,/* obsolete, do not use */
+       TCA_FQ_FLOW_DEFAULT_RATE,/* for sockets with unspecified sk_rate,
+                                 * use the following rate
+                                 */
 
        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
 };