pull request: sfc 2012-08-24

pull request: sfc 2012-08-24

[Ben Hutchings]

The following changes since commit 78df76a065ae3b5dbcb9a29912adc02f697de498:

  ipv4: take rt_uncached_lock only if needed (2012-08-24 11:47:48 -0400)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc.git sfc-3.6

(commit ac70b2e9a13423b5efa0178e081936ce6979aea5)

Simple fix for a braino.  Please also queue this for the 3.4 and 3.5
stable series.

Ben.

Ben Hutchings (1):
      sfc: Fix reporting of IPv4 full filters through ethtool

 drivers/net/ethernet/sfc/ethtool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

[PATCH net] sfc: Fix reporting of IPv4 full filters through ethtool

[Ben Hutchings]

ETHTOOL_GRXCLSRULE returns filters for a TCP/IPv4 or UDP/IPv4 4-tuple
with source and destination swapped.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
 drivers/net/ethernet/sfc/ethtool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 8cba2df..5faedd8 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -863,8 +863,8 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx,
 				       &ip_entry->ip4dst, &ip_entry->pdst);
 	if (rc != 0) {
 		rc = efx_filter_get_ipv4_full(
-			&spec, &proto, &ip_entry->ip4src, &ip_entry->psrc,
-			&ip_entry->ip4dst, &ip_entry->pdst);
+			&spec, &proto, &ip_entry->ip4dst, &ip_entry->pdst,
+			&ip_entry->ip4src, &ip_entry->psrc);
 		EFX_WARN_ON_PARANOID(rc);
 		ip_mask->ip4src = ~0;
 		ip_mask->psrc = ~0;
-- 
1.7.7.6


-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

Re: pull request: sfc 2012-08-24

[David Miller]

From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 24 Aug 2012 20:58:45 +0100

> Simple fix for a braino.  Please also queue this for the 3.4 and 3.5
> stable series.

Ok, pulled and queued up for -stable, thanks Ben.