aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-12-29 11:27:11 -0500
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-03 17:41:42 -0500
commit86f8515f9721fa171483f0fe0391968fbb949cc9 (patch)
treea21f4df024bc16044cb174948494180769cbcbbe /include/linux/netdevice.h
parentfe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8 (diff)
net: netprio: rename config to be more consistent with cgroup configs
While we're at it and introduced CGROUP_NET_CLASSID, lets also make NETPRIO_CGROUP more consistent with the rest of cgroups and rename it into CONFIG_CGROUP_NET_PRIO so that for networking, we now have CONFIG_CGROUP_NET_{PRIO,CLASSID}. This not only makes the CONFIG option consistent among networking cgroups, but also among cgroups CONFIG conventions in general as the vast majority has a prefix of CONFIG_CGROUP_<SUBSYS>. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Cc: Zefan Li <lizefan@huawei.com> Cc: cgroups@vger.kernel.org Acked-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 5260d2eae2e6..45cf68194aa8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1444,7 +1444,7 @@ struct net_device {
1444 /* max exchange id for FCoE LRO by ddp */ 1444 /* max exchange id for FCoE LRO by ddp */
1445 unsigned int fcoe_ddp_xid; 1445 unsigned int fcoe_ddp_xid;
1446#endif 1446#endif
1447#if IS_ENABLED(CONFIG_NETPRIO_CGROUP) 1447#if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)
1448 struct netprio_map __rcu *priomap; 1448 struct netprio_map __rcu *priomap;
1449#endif 1449#endif
1450 /* phy device may attach itself for hardware timestamping */ 1450 /* phy device may attach itself for hardware timestamping */