Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f88cf73d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc 



Ben Hutchings says:

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cd5c2ed6 ac70b2e9

drivers/net/ethernet/sfc/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -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;