From e40bb85e14b5a60fe4aba7923c6ca03728b37ba8 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Thu, 13 Dec 2012 05:20:59 +0000 Subject: [PATCH] --- yaml --- r: 343355 b: refs/heads/master c: dc2e57340deb8be1133b1eae2c7d4303133c133c h: refs/heads/master i: 343353: 4e74b86ec90e3b5d718ba92910d5959a24e95a0c 343351: 082e85b863df3fe0654b9f3de80b6db48baa16bd v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/ethtool.h | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cfed8b1e0df1..ca18dcd608e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bdc1b4abab3af0a803300f706c9814ef4e20a3e +refs/heads/master: dc2e57340deb8be1133b1eae2c7d4303133c133c diff --git a/trunk/include/uapi/linux/ethtool.h b/trunk/include/uapi/linux/ethtool.h index be8c41e2dc15..0c9b44871df0 100644 --- a/trunk/include/uapi/linux/ethtool.h +++ b/trunk/include/uapi/linux/ethtool.h @@ -503,9 +503,20 @@ union ethtool_flow_union { __u8 hdata[52]; }; +/** + * struct ethtool_flow_ext - additional RX flow fields + * @h_dest: destination MAC address + * @vlan_etype: VLAN EtherType + * @vlan_tci: VLAN tag control information + * @data: user defined data + * + * Note, @vlan_etype, @vlan_tci, and @data are only valid if %FLOW_EXT + * is set in &struct ethtool_rx_flow_spec @flow_type. + * @h_dest is valid if %FLOW_MAC_EXT is set. + */ struct ethtool_flow_ext { __u8 padding[2]; - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ + unsigned char h_dest[ETH_ALEN]; __be16 vlan_etype; __be16 vlan_tci; __be32 data[2]; @@ -519,7 +530,8 @@ struct ethtool_flow_ext { * @m_u: Masks for flow field bits to be matched * @m_ext: Masks for additional field bits to be matched * Note, all additional fields must be ignored unless @flow_type - * includes the %FLOW_EXT flag. + * includes the %FLOW_EXT or %FLOW_MAC_EXT flag + * (see &struct ethtool_flow_ext description). * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC * if packets should be discarded * @location: Location of rule in the table. Locations must be