From dc0e9c7f2291daecf474f8805f402974e8f3e975 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 22 Nov 2013 17:29:02 -0800 Subject: [PATCH] update to net-next headers --- include/linux/genetlink.h | 1 - include/linux/pkt_sched.h | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index d48123a13..1f85a2769 100644 --- 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 a806687ad..307f29347 100644 --- 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 }; -- 2.47.3