matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update kernel headers to 4.3 net-next

This commit is contained in:
Stephen Hemminger 2015-09-23 16:18:34 -07:00
parent 5b9ac19029
commit 4e39bfb93a
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/bpf.h
View File

@ -272,6 +272,14 @@ enum bpf_func_id {
BPF_FUNC_skb_get_tunnel_key, BPF_FUNC_skb_get_tunnel_key,
BPF_FUNC_skb_set_tunnel_key, BPF_FUNC_skb_set_tunnel_key,
BPF_FUNC_perf_event_read, /* u64 bpf_perf_event_read(&map, index) */ BPF_FUNC_perf_event_read, /* u64 bpf_perf_event_read(&map, index) */
/**
* bpf_redirect(ifindex, flags) - redirect to another netdev
* @ifindex: ifindex of the net device
* @flags: bit 0 - if set, redirect to ingress instead of egress
* other bits - reserved
* Return: TC_ACT_REDIRECT
*/
BPF_FUNC_redirect,
__BPF_FUNC_MAX_ID, __BPF_FUNC_MAX_ID,
}; };
@ -293,6 +301,7 @@ struct __sk_buff {
__u32 tc_index; __u32 tc_index;
__u32 cb[5]; __u32 cb[5];
__u32 hash; __u32 hash;
__u32 tc_classid;
}; };
struct bpf_tunnel_key { struct bpf_tunnel_key {

1
include/linux/if_ether.h
View File

@ -42,6 +42,7 @@
#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ #define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */
#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ #define ETH_P_PUP 0x0200 /* Xerox PUP packet */
#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ #define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */
#define ETH_P_TSN 0x22F0 /* TSN (IEEE 1722) packet */
#define ETH_P_IP 0x0800 /* Internet Protocol packet */ #define ETH_P_IP 0x0800 /* Internet Protocol packet */
#define ETH_P_X25 0x0805 /* CCITT X.25 */ #define ETH_P_X25 0x0805 /* CCITT X.25 */
#define ETH_P_ARP 0x0806 /* Address Resolution packet */ #define ETH_P_ARP 0x0806 /* Address Resolution packet */

4
include/linux/pkt_cls.h
View File

@ -33,6 +33,7 @@ enum {
#define TC_ACT_STOLEN 4 #define TC_ACT_STOLEN 4
#define TC_ACT_QUEUED 5 #define TC_ACT_QUEUED 5
#define TC_ACT_REPEAT 6 #define TC_ACT_REPEAT 6
#define TC_ACT_REDIRECT 7
#define TC_ACT_JUMP 0x10000000 #define TC_ACT_JUMP 0x10000000
/* Action type identifiers*/ /* Action type identifiers*/
@ -319,6 +320,8 @@ enum {
/* BPF classifier */ /* BPF classifier */
#define TCA_BPF_FLAG_ACT_DIRECT (1 << 0)
enum { enum {
TCA_BPF_UNSPEC, TCA_BPF_UNSPEC,
TCA_BPF_ACT, TCA_BPF_ACT,
@ -328,6 +331,7 @@ enum {
TCA_BPF_OPS, TCA_BPF_OPS,
TCA_BPF_FD, TCA_BPF_FD,
TCA_BPF_NAME, TCA_BPF_NAME,
TCA_BPF_FLAGS,
__TCA_BPF_MAX, __TCA_BPF_MAX,
}; };

2
include/linux/rtnetlink.h
View File

@ -270,6 +270,7 @@ enum rt_scope_t {
#define RTM_F_CLONED 0x200 /* This route is cloned */ #define RTM_F_CLONED 0x200 /* This route is cloned */
#define RTM_F_EQUALIZE 0x400 /* Multipath equalizer: NI */ #define RTM_F_EQUALIZE 0x400 /* Multipath equalizer: NI */
#define RTM_F_PREFIX 0x800 /* Prefix addresses */ #define RTM_F_PREFIX 0x800 /* Prefix addresses */
#define RTM_F_LOOKUP_TABLE 0x1000 /* set rtm_table to FIB lookup result */
/* Reserved table identifiers */ /* Reserved table identifiers */
@ -664,6 +665,7 @@ struct tcamsg {
#define RTEXT_FILTER_VF (1 << 0) #define RTEXT_FILTER_VF (1 << 0)
#define RTEXT_FILTER_BRVLAN (1 << 1) #define RTEXT_FILTER_BRVLAN (1 << 1)
#define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2) #define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2)
#define RTEXT_FILTER_SKIP_STATS (1 << 3)
/* End of information exported to user level */ /* End of information exported to user level */

3
include/linux/tc_act/tc_skbedit.h
View File

@ -11,7 +11,8 @@
* more details. * more details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, see <http://www.gnu.org/licenses>. * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
* Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Author: Alexander Duyck <alexander.h.duyck@intel.com> * Author: Alexander Duyck <alexander.h.duyck@intel.com>
*/ */