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

update to 3.10-net-next headers

This commit is contained in:
Stephen Hemminger 2013-06-19 18:14:17 -07:00
parent a303853e84
commit 318ad9d745
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/gen_stats.h
View File

@ -9,6 +9,7 @@ enum {
TCA_STATS_RATE_EST, TCA_STATS_RATE_EST,
TCA_STATS_QUEUE, TCA_STATS_QUEUE,
TCA_STATS_APP, TCA_STATS_APP,
TCA_STATS_RATE_EST64,
__TCA_STATS_MAX, __TCA_STATS_MAX,
}; };
#define TCA_STATS_MAX (__TCA_STATS_MAX - 1) #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
@ -37,6 +38,16 @@ struct gnet_stats_rate_est {
__u32 pps; __u32 pps;
}; };
/**
* struct gnet_stats_rate_est64 - rate estimator
* @bps: current byte rate
* @pps: current packet rate
*/
struct gnet_stats_rate_est64 {
__u64 bps;
__u64 pps;
};
/** /**
* struct gnet_stats_queue - queuing statistics * struct gnet_stats_queue - queuing statistics
* @qlen: queue length * @qlen: queue length

15
include/linux/if_link.h
View File

@ -219,6 +219,8 @@ enum {
IFLA_BRPORT_GUARD, /* bpdu guard */ IFLA_BRPORT_GUARD, /* bpdu guard */
IFLA_BRPORT_PROTECT, /* root port protection */ IFLA_BRPORT_PROTECT, /* root port protection */
IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */ IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */
IFLA_BRPORT_LEARNING, /* mac learning */
IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
__IFLA_BRPORT_MAX __IFLA_BRPORT_MAX
}; };
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@ -334,6 +336,7 @@ enum {
IFLA_VF_VLAN, IFLA_VF_VLAN,
IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */ IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */
__IFLA_VF_MAX, __IFLA_VF_MAX,
}; };
@ -360,6 +363,18 @@ struct ifla_vf_spoofchk {
__u32 setting; __u32 setting;
}; };
enum {
IFLA_VF_LINK_STATE_AUTO, /* link state of the uplink */
IFLA_VF_LINK_STATE_ENABLE, /* link always up */
IFLA_VF_LINK_STATE_DISABLE, /* link always down */
__IFLA_VF_LINK_STATE_MAX,
};
struct ifla_vf_link_state {
__u32 vf;
__u32 link_state;
};
/* VF ports management section /* VF ports management section
* *
* Nested layout of set/get msg is: * Nested layout of set/get msg is:

2
include/linux/if_tun.h
View File

@ -68,6 +68,8 @@
#define IFF_MULTI_QUEUE 0x0100 #define IFF_MULTI_QUEUE 0x0100
#define IFF_ATTACH_QUEUE 0x0200 #define IFF_ATTACH_QUEUE 0x0200
#define IFF_DETACH_QUEUE 0x0400 #define IFF_DETACH_QUEUE 0x0400
/* read-only flag */
#define IFF_PERSIST 0x0800
/* 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. */