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

Update to 3.11 net-next kernel headers

This commit is contained in:
Stephen Hemminger 2013-09-03 08:46:40 -07:00
parent c5e3ee2c1f
commit c92716d1ed
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/if_link.h
View File

@ -312,6 +312,8 @@ enum {
IFLA_VXLAN_L2MISS, IFLA_VXLAN_L2MISS,
IFLA_VXLAN_L3MISS, IFLA_VXLAN_L3MISS,
IFLA_VXLAN_PORT, /* destination port */ IFLA_VXLAN_PORT, /* destination port */
IFLA_VXLAN_GROUP6,
IFLA_VXLAN_LOCAL6,
__IFLA_VXLAN_MAX __IFLA_VXLAN_MAX
}; };
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)

3
include/linux/if_tun.h
View File

@ -56,6 +56,8 @@
#define TUNGETVNETHDRSZ _IOR('T', 215, int) #define TUNGETVNETHDRSZ _IOR('T', 215, int)
#define TUNSETVNETHDRSZ _IOW('T', 216, int) #define TUNSETVNETHDRSZ _IOW('T', 216, int)
#define TUNSETQUEUE _IOW('T', 217, int) #define TUNSETQUEUE _IOW('T', 217, int)
#define TUNSETIFINDEX _IOW('T', 218, unsigned int)
#define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
/* TUNSETIFF ifr flags */ /* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001 #define IFF_TUN 0x0001
@ -70,6 +72,7 @@
#define IFF_DETACH_QUEUE 0x0400 #define IFF_DETACH_QUEUE 0x0400
/* read-only flag */ /* read-only flag */
#define IFF_PERSIST 0x0800 #define IFF_PERSIST 0x0800
#define IFF_NOFILTER 0x1000
/* Socket options */ /* Socket options */
#define TUN_TX_TIMESTAMP 1 #define TUN_TX_TIMESTAMP 1

41
include/linux/pkt_sched.h
View File

@ -744,4 +744,45 @@ struct tc_fq_codel_xstats {
}; };
}; };
/* FQ */
enum {
TCA_FQ_UNSPEC,
TCA_FQ_PLIMIT, /* limit of total number of packets in queue */
TCA_FQ_FLOW_PLIMIT, /* limit of packets per flow */
TCA_FQ_QUANTUM, /* RR quantum */
TCA_FQ_INITIAL_QUANTUM, /* RR quantum for new flow */
TCA_FQ_RATE_ENABLE, /* enable/disable rate limiting */
TCA_FQ_FLOW_DEFAULT_RATE,/* for sockets with unspecified sk_rate,
* use the following rate
*/
TCA_FQ_FLOW_MAX_RATE, /* per flow max rate */
TCA_FQ_BUCKETS_LOG, /* log2(number of buckets) */
__TCA_FQ_MAX
};
#define TCA_FQ_MAX (__TCA_FQ_MAX - 1)
struct tc_fq_qd_stats {
__u64 gc_flows;
__u64 highprio_packets;
__u64 tcp_retrans;
__u64 throttled;
__u64 flows_plimit;
__u64 pkts_too_long;
__u64 allocation_errors;
__s64 time_next_delayed_flow;
__u32 flows;
__u32 inactive_flows;
__u32 throttled_flows;
__u32 pad;
};
#endif #endif