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

Update to 3.3 headers (with inet_diag fix) 

Incorporate change to fix inet_diag build failure.
This commit is contained in:
Stephen Hemminger 2012-01-19 14:09:42 -08:00
parent a08d2590a0
commit 7878c0ba40
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/inet_diag.h
View File

@ -22,7 +22,7 @@ struct inet_diag_sockid {
/* Request structure */ /* Request structure */
struct inet_diag_req_compat { struct inet_diag_req {
__u8 idiag_family; /* Family of addresses. */ __u8 idiag_family; /* Family of addresses. */
__u8 idiag_src_len; __u8 idiag_src_len;
__u8 idiag_dst_len; __u8 idiag_dst_len;
@ -34,7 +34,7 @@ struct inet_diag_req_compat {
__u32 idiag_dbs; /* Tables to dump (NI) */ __u32 idiag_dbs; /* Tables to dump (NI) */
}; };
struct inet_diag_req { struct inet_diag_req_v2 {
__u8 sdiag_family; __u8 sdiag_family;
__u8 sdiag_protocol; __u8 sdiag_protocol;
__u8 idiag_ext; __u8 idiag_ext;

20
include/linux/pkt_sched.h
View File

@ -162,10 +162,30 @@ struct tc_sfq_qopt {
unsigned flows; /* Maximal number of flows */ unsigned flows; /* Maximal number of flows */
}; };
struct tc_sfqred_stats {
__u32 prob_drop; /* Early drops, below max threshold */
__u32 forced_drop; /* Early drops, after max threshold */
__u32 prob_mark; /* Marked packets, below max threshold */
__u32 forced_mark; /* Marked packets, after max threshold */
__u32 prob_mark_head; /* Marked packets, below max threshold */
__u32 forced_mark_head;/* Marked packets, after max threshold */
};
struct tc_sfq_qopt_v1 { struct tc_sfq_qopt_v1 {
struct tc_sfq_qopt v0; struct tc_sfq_qopt v0;
unsigned int depth; /* max number of packets per flow */ unsigned int depth; /* max number of packets per flow */
unsigned int headdrop; unsigned int headdrop;
/* SFQRED parameters */
__u32 limit; /* HARD maximal flow queue length (bytes) */
__u32 qth_min; /* Min average length threshold (bytes) */
__u32 qth_max; /* Max average length threshold (bytes) */
unsigned char Wlog; /* log(W) */
unsigned char Plog; /* log(P_max/(qth_max-qth_min)) */
unsigned char Scell_log; /* cell size for idle damping */
unsigned char flags;
__u32 max_P; /* probability, high resolution */
/* SFQRED stats */
struct tc_sfqred_stats stats;
}; };