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

Update kernel headers to net-next for 3.12

This commit is contained in:
Stephen Hemminger 2013-08-04 11:43:02 -07:00
parent 3140e9a3a3
commit 5318b2c667
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/fib_rules.h
View File

@ -44,8 +44,8 @@ enum {
FRA_FWMARK, /* mark */ FRA_FWMARK, /* mark */
FRA_FLOW, /* flow/class id */ FRA_FLOW, /* flow/class id */
FRA_UNUSED6, FRA_UNUSED6,
FRA_UNUSED7, FRA_SUPPRESS_IFGROUP,
FRA_UNUSED8, FRA_SUPPRESS_PREFIXLEN,
FRA_TABLE, /* Extended table id */ FRA_TABLE, /* Extended table id */
FRA_FWMASK, /* mask for netfilter mark */ FRA_FWMASK, /* mask for netfilter mark */
FRA_OIFNAME, FRA_OIFNAME,

3
include/linux/if_bridge.h
View File

@ -14,6 +14,7 @@
#define _LINUX_IF_BRIDGE_H #define _LINUX_IF_BRIDGE_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_ether.h>
#define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward" #define SYSFS_BRIDGE_FDB "brforward"
@ -88,7 +89,7 @@ struct __port_info {
}; };
struct __fdb_entry { struct __fdb_entry {
__u8 mac_addr[6]; __u8 mac_addr[ETH_ALEN];
__u8 port_no; __u8 port_no;
__u8 is_local; __u8 is_local;
__u32 ageing_timer_value; __u32 ageing_timer_value;

1
include/linux/if_link.h
View File

@ -143,6 +143,7 @@ enum {
IFLA_NUM_TX_QUEUES, IFLA_NUM_TX_QUEUES,
IFLA_NUM_RX_QUEUES, IFLA_NUM_RX_QUEUES,
IFLA_CARRIER, IFLA_CARRIER,
IFLA_PHYS_PORT_ID,
__IFLA_MAX __IFLA_MAX
}; };

3
include/linux/if_tun.h
View File

@ -71,6 +71,9 @@
/* read-only flag */ /* read-only flag */
#define IFF_PERSIST 0x0800 #define IFF_PERSIST 0x0800
/* Socket options */
#define TUN_TX_TIMESTAMP 1
/* Features for GSO (TUNSETOFFLOAD). */ /* Features for GSO (TUNSETOFFLOAD). */
#define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */
#define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */ #define TUN_F_TSO4 0x02 /* I can handle TSO for IPv4 packets */

1
include/linux/tcp.h
View File

@ -111,6 +111,7 @@ enum {
#define TCP_REPAIR_OPTIONS 22 #define TCP_REPAIR_OPTIONS 22
#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
#define TCP_TIMESTAMP 24 #define TCP_TIMESTAMP 24
#define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */
struct tcp_repair_opt { struct tcp_repair_opt {
__u32 opt_code; __u32 opt_code;