From 5318b2c6674101795d6658d3feedc927789f2eec Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sun, 4 Aug 2013 11:43:02 -0700 Subject: [PATCH] Update kernel headers to net-next for 3.12 --- include/linux/fib_rules.h | 4 ++-- include/linux/if_bridge.h | 3 ++- include/linux/if_link.h | 1 + include/linux/if_tun.h | 3 +++ include/linux/tcp.h | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h index 51da65b68..2b82d7e30 100644 --- a/include/linux/fib_rules.h +++ b/include/linux/fib_rules.h @@ -44,8 +44,8 @@ enum { FRA_FWMARK, /* mark */ FRA_FLOW, /* flow/class id */ FRA_UNUSED6, - FRA_UNUSED7, - FRA_UNUSED8, + FRA_SUPPRESS_IFGROUP, + FRA_SUPPRESS_PREFIXLEN, FRA_TABLE, /* Extended table id */ FRA_FWMASK, /* mask for netfilter mark */ FRA_OIFNAME, diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index d37e53c37..d2de4e67f 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -14,6 +14,7 @@ #define _LINUX_IF_BRIDGE_H #include +#include #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" @@ -88,7 +89,7 @@ struct __port_info { }; struct __fdb_entry { - __u8 mac_addr[6]; + __u8 mac_addr[ETH_ALEN]; __u8 port_no; __u8 is_local; __u32 ageing_timer_value; diff --git a/include/linux/if_link.h b/include/linux/if_link.h index d07aecaaf..f80fcea6a 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -143,6 +143,7 @@ enum { IFLA_NUM_TX_QUEUES, IFLA_NUM_RX_QUEUES, IFLA_CARRIER, + IFLA_PHYS_PORT_ID, __IFLA_MAX }; diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index dc13de35d..6a7fb11d5 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -71,6 +71,9 @@ /* read-only flag */ #define IFF_PERSIST 0x0800 +/* Socket options */ +#define TUN_TX_TIMESTAMP 1 + /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ #define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */ diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 1eb04d354..8df6bd7f4 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -111,6 +111,7 @@ enum { #define TCP_REPAIR_OPTIONS 22 #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ #define TCP_TIMESTAMP 24 +#define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */ struct tcp_repair_opt { __u32 opt_code; -- 2.47.3