aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ethtool.h
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2011-09-06 09:48:20 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-16 19:25:10 -0400
commit9927c893f4442f5045a919ff7c78113ded9c709e (patch)
tree1ec84cce7cf070e01688887170c4ed21121b9812 /include/linux/ethtool.h
parent956a206620fa048afdcd8ab714ac3cf6a9e884b7 (diff)
ethtool: Make struct ethtool_rxnfc kernel-doc more self-consistent
Refer consistently to 'classification rules' or just 'rules' rather than 'filter specifications' or 'filter rules'. Refer consistently to rule 'locations' and not 'indices'. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ethtool.h')
-rw-r--r--include/linux/ethtool.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 8571f18c38a6..30a4f9083a44 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -446,7 +446,7 @@ struct ethtool_flow_ext {
446}; 446};
447 447
448/** 448/**
449 * struct ethtool_rx_flow_spec - specification for RX flow filter 449 * struct ethtool_rx_flow_spec - classification rule for RX flows
450 * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW 450 * @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
451 * @h_u: Flow fields to match (dependent on @flow_type) 451 * @h_u: Flow fields to match (dependent on @flow_type)
452 * @h_ext: Additional fields to match 452 * @h_ext: Additional fields to match
@@ -456,7 +456,7 @@ struct ethtool_flow_ext {
456 * includes the %FLOW_EXT flag. 456 * includes the %FLOW_EXT flag.
457 * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC 457 * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
458 * if packets should be discarded 458 * if packets should be discarded
459 * @location: Index of filter in hardware table 459 * @location: Location of rule in the table
460 */ 460 */
461struct ethtool_rx_flow_spec { 461struct ethtool_rx_flow_spec {
462 __u32 flow_type; 462 __u32 flow_type;
@@ -475,9 +475,9 @@ struct ethtool_rx_flow_spec {
475 * %ETHTOOL_GRXCLSRLALL, %ETHTOOL_SRXCLSRLDEL or %ETHTOOL_SRXCLSRLINS 475 * %ETHTOOL_GRXCLSRLALL, %ETHTOOL_SRXCLSRLDEL or %ETHTOOL_SRXCLSRLINS
476 * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW 476 * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW
477 * @data: Command-dependent value 477 * @data: Command-dependent value
478 * @fs: Flow filter specification 478 * @fs: Flow classification rule
479 * @rule_cnt: Number of rules to be affected 479 * @rule_cnt: Number of rules to be affected
480 * @rule_locs: Array of valid rule indices 480 * @rule_locs: Array of valid rule locations
481 * 481 *
482 * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating 482 * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating
483 * the fields included in the flow hash, e.g. %RXH_IP_SRC. The following 483 * the fields included in the flow hash, e.g. %RXH_IP_SRC. The following
@@ -489,20 +489,19 @@ struct ethtool_rx_flow_spec {
489 * For %ETHTOOL_GRXCLSRLCNT, @rule_cnt is set to the number of defined 489 * For %ETHTOOL_GRXCLSRLCNT, @rule_cnt is set to the number of defined
490 * rules on return. 490 * rules on return.
491 * 491 *
492 * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the index of an 492 * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an
493 * existing filter rule on entry and @fs contains the rule on return. 493 * existing rule on entry and @fs contains the rule on return.
494 * 494 *
495 * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the 495 * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the
496 * user buffer for @rule_locs on entry. On return, @data is the size 496 * user buffer for @rule_locs on entry. On return, @data is the size
497 * of the filter table and @rule_locs contains the indices of the 497 * of the rule table and @rule_locs contains the locations of the
498 * defined rules. 498 * defined rules.
499 * 499 *
500 * For %ETHTOOL_SRXCLSRLINS, @fs specifies the filter rule to add or 500 * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.
501 * update. @fs.@location specifies the index to use and must not be 501 * @fs.@location specifies the location to use and must not be ignored.
502 * ignored.
503 * 502 *
504 * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the index of an 503 * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
505 * existing filter rule on entry. 504 * existing rule on entry.
506 * 505 *
507 * Implementation of indexed classification rules generally requires a 506 * Implementation of indexed classification rules generally requires a
508 * TCAM. 507 * TCAM.