From 693646f60a2ab8c7464383882601caff64af1b22 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 6 Sep 2011 13:48:56 +0000
Subject: [PATCH] --- yaml --- r: 265936 b: refs/heads/master c:
 434495c50ea786b89eca7f7af2bac424658a76ee h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/ethtool.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 79605b6095ca..3c172d398ba6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9927c893f4442f5045a919ff7c78113ded9c709e
+refs/heads/master: 434495c50ea786b89eca7f7af2bac424658a76ee
diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h
index 30a4f9083a44..b5d189367a02 100644
--- a/trunk/include/linux/ethtool.h
+++ b/trunk/include/linux/ethtool.h
@@ -456,7 +456,9 @@ struct ethtool_flow_ext {
  *	includes the %FLOW_EXT flag.
  * @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
+ * @location: Location of rule in the table.  Locations must be
+ *	numbered such that a flow matching multiple rules will be
+ *	classified according to the first (lowest numbered) rule.
  */
 struct ethtool_rx_flow_spec {
 	__u32		flow_type;
@@ -502,9 +504,6 @@ struct ethtool_rx_flow_spec {
  *
  * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
  * existing rule on entry.
- *
- * Implementation of indexed classification rules generally requires a
- * TCAM.
  */
 struct ethtool_rxnfc {
 	__u32				cmd;