aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-01-03 07:04:51 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-04 14:09:10 -0500
commit55664f324c2a1a6386dc88492c5c94aa3d336b93 (patch)
treea1859e049a47b3bb207882e4b9db126987f2ead9 /net/socket.c
parent3a73e49caa75928149ea54f570f8afb5f6f4774d (diff)
ethtool: Allow drivers to select RX NFC rule locations
Define special location values for RX NFC that request the driver to select the actual rule location. This allows for implementation on devices that use hash-based filter lookup, whereas currently the API is more suited to devices with TCAM lookup or linear search. In ethtool_set_rxnfc() and the compat wrapper ethtool_ioctl(), copy the structure back to user-space after insertion so that the actual location is returned. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index e62b4f055071..2cad581318fe 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2758,10 +2758,10 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
2758 case ETHTOOL_GRXRINGS: 2758 case ETHTOOL_GRXRINGS:
2759 case ETHTOOL_GRXCLSRLCNT: 2759 case ETHTOOL_GRXCLSRLCNT:
2760 case ETHTOOL_GRXCLSRULE: 2760 case ETHTOOL_GRXCLSRULE:
2761 case ETHTOOL_SRXCLSRLINS:
2761 convert_out = true; 2762 convert_out = true;
2762 /* fall through */ 2763 /* fall through */
2763 case ETHTOOL_SRXCLSRLDEL: 2764 case ETHTOOL_SRXCLSRLDEL:
2764 case ETHTOOL_SRXCLSRLINS:
2765 buf_size += sizeof(struct ethtool_rxnfc); 2765 buf_size += sizeof(struct ethtool_rxnfc);
2766 convert_in = true; 2766 convert_in = true;
2767 break; 2767 break;