diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2013-06-19 18:14:17 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2013-06-19 18:14:17 -0700 |
| commit | 318ad9d74522418889805cb0fac493409a78304b (patch) | |
| tree | a32ddd081b306f4bd560c8e736ed5ceec14a86b8 | |
| parent | a303853e844ce4eb755399f811b0d8a8c71c6b88 (diff) | |
update to 3.10-net-next headers
| -rw-r--r-- | include/linux/gen_stats.h | 11 | ||||
| -rw-r--r-- | include/linux/if_link.h | 15 | ||||
| -rw-r--r-- | include/linux/if_tun.h | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h index 552c8a0a..6487317e 100644 --- a/include/linux/gen_stats.h +++ b/include/linux/gen_stats.h @@ -9,6 +9,7 @@ enum { TCA_STATS_RATE_EST, TCA_STATS_QUEUE, TCA_STATS_APP, + TCA_STATS_RATE_EST64, __TCA_STATS_MAX, }; #define TCA_STATS_MAX (__TCA_STATS_MAX - 1) @@ -38,6 +39,16 @@ struct gnet_stats_rate_est { }; /** + * 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 * @qlen: queue length * @backlog: backlog size of queue diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 965dc9f9..d07aecaa 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -219,6 +219,8 @@ enum { IFLA_BRPORT_GUARD, /* bpdu guard */ IFLA_BRPORT_PROTECT, /* root port protection */ IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */ + IFLA_BRPORT_LEARNING, /* mac learning */ + IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */ __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) @@ -334,6 +336,7 @@ enum { IFLA_VF_VLAN, IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */ + IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */ __IFLA_VF_MAX, }; @@ -360,6 +363,18 @@ struct ifla_vf_spoofchk { __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 * * Nested layout of set/get msg is: diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index dffb1927..dc13de35 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -68,6 +68,8 @@ #define IFF_MULTI_QUEUE 0x0100 #define IFF_ATTACH_QUEUE 0x0200 #define IFF_DETACH_QUEUE 0x0400 +/* read-only flag */ +#define IFF_PERSIST 0x0800 /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ |