diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2013-10-30 16:42:03 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2013-10-30 16:42:03 -0700 |
commit | 793da0e7023ce29e32914af477fdbcc4bdbb022f (patch) | |
tree | 00b69c4db62da12287cf9355538c87ce4f2c2de4 | |
parent | f1f1aeb2adb839f719f0dfc91954d22710128d38 (diff) | |
download | iproute2-793da0e7023ce29e32914af477fdbcc4bdbb022f.tar.gz |
Update kernel headers
Lastest from net-next
-rw-r--r-- | include/linux/can/netlink.h | 8 | ||||
-rw-r--r-- | include/linux/if_link.h | 11 | ||||
-rw-r--r-- | include/linux/pkt_cls.h | 14 | ||||
-rw-r--r-- | include/linux/pkt_sched.h | 2 |
4 files changed, 35 insertions, 0 deletions
diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h index 14966ddb..df944ed2 100644 --- a/include/linux/can/netlink.h +++ b/include/linux/can/netlink.h @@ -5,6 +5,14 @@ * * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the version 2 of the GNU General Public License + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #ifndef CAN_NETLINK_H diff --git a/include/linux/if_link.h b/include/linux/if_link.h index ee4f2ba9..a485920f 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -323,6 +323,17 @@ struct ifla_vxlan_port_range { __be16 high; }; +/* Bonding section */ + +enum { + IFLA_BOND_UNSPEC, + IFLA_BOND_MODE, + IFLA_BOND_ACTIVE_SLAVE, + __IFLA_BOND_MAX, +}; + +#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1) + /* SR-IOV virtual function management section */ enum { diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index 082eafaf..25731dfb 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -388,6 +388,20 @@ enum { #define TCA_CGROUP_MAX (__TCA_CGROUP_MAX - 1) +/* BPF classifier */ + +enum { + TCA_BPF_UNSPEC, + TCA_BPF_ACT, + TCA_BPF_POLICE, + TCA_BPF_CLASSID, + TCA_BPF_OPS_LEN, + TCA_BPF_OPS, + __TCA_BPF_MAX, +}; + +#define TCA_BPF_MAX (__TCA_BPF_MAX - 1) + /* Extended Matches */ struct tcf_ematch_tree_hdr { diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index 9b829134..f2624b54 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -357,6 +357,8 @@ enum { TCA_HTB_CTAB, TCA_HTB_RTAB, TCA_HTB_DIRECT_QLEN, + TCA_HTB_RATE64, + TCA_HTB_CEIL64, __TCA_HTB_MAX, }; |