[Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

[Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

[Jacob Keller]

When comparing MAC addresses, use ether_addr_equal instead of memcmp to
ETH_ALEN length. Found and replaced using the following sed:

 sed -e 's/memcmp\x28\(.*\), ETH_ALEN\x29/!ether_addr_equal\x28\1\x29/'

Reported-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---

Notes:

    This replaces the version on the queue inline and corrects issues
    with all 4 tests that were replaced. It should fix the mailbox
    ethtool test among other possible issues.

    - v2
    * correct sed expression and fix mis-use of ether_addr_equal

 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pf.c  | 2 +-
 drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +-
 drivers/net/ethernet/intel/fm10k/fm10k_vf.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 15d8e10c2504..5a13e74db0e5 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -1164,7 +1164,7 @@ static s32 fm10k_mbx_mac_addr(struct fm10k_hw *hw, u32 **results,
 
 	/* MAC was changed so we need reset */
 	if (is_valid_ether_addr(hw->mac.perm_addr) &&
-	    memcmp(hw->mac.perm_addr, hw->mac.addr, ETH_ALEN))
+	    !ether_addr_equal(hw->mac.perm_addr, hw->mac.addr))
 		interface->flags |= FM10K_FLAG_RESET_REQUESTED;
 
 	/* VLAN override was changed, or default VLAN changed */
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
index bbf0b4aef241..b83e23ba23a4 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
@@ -1249,7 +1249,7 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
 
 		/* block attempts to set MAC for a locked device */
 		if (is_valid_ether_addr(vf_info->mac) &&
-		    memcmp(mac, vf_info->mac, ETH_ALEN))
+		    !ether_addr_equal(mac, vf_info->mac))
 			return FM10K_ERR_PARAM;
 
 		set = !(vlan & FM10K_VLAN_CLEAR);
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
index 9b29d7b0377a..ae255234d8f4 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
@@ -755,7 +755,7 @@ s32 fm10k_tlv_msg_test(struct fm10k_hw *hw, u32 **results,
 		err = fm10k_tlv_attr_get_mac_vlan(
 					results[FM10K_TEST_MSG_MAC_ADDR],
 					result_mac, &result_vlan);
-		if (!err && memcmp(test_mac, result_mac, ETH_ALEN))
+		if (!err && !ether_addr_equal(test_mac, result_mac))
 			err = FM10K_ERR_INVALID_VALUE;
 		if (!err && test_vlan != result_vlan)
 			err = FM10K_ERR_INVALID_VALUE;
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
index 2af697df5abc..bde7f01b3380 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_vf.c
@@ -298,7 +298,7 @@ static s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort,
 
 	/* verify we are not locked down on the MAC address */
 	if (is_valid_ether_addr(hw->mac.perm_addr) &&
-	    memcmp(hw->mac.perm_addr, mac, ETH_ALEN))
+	    !ether_addr_equal(hw->mac.perm_addr, mac))
 		return FM10K_ERR_PARAM;
 
 	/* add bit to notify us if this is a set or clear operation */
-- 
2.6.3.491.g3e3f6ce

[Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

[Allan, Bruce W]

> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On
> Behalf Of Jacob Keller
> Sent: Monday, November 16, 2015 3:34 PM
> To: Intel Wired LAN
> Subject: [Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead
> of memcmp
> 
> When comparing MAC addresses, use ether_addr_equal instead of
> memcmp to
> ETH_ALEN length. Found and replaced using the following sed:
> 
>  sed -e 's/memcmp\x28\(.*\),
> ETH_ALEN\x29/!ether_addr_equal\x28\1\x29/'
> 
> Reported-by: Bruce Allan <bruce.w.allan@intel.com>
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> 
> Notes:
> 
>     This replaces the version on the queue inline and corrects issues
>     with all 4 tests that were replaced. It should fix the mailbox
>     ethtool test among other possible issues.
> 
>     - v2
>     * correct sed expression and fix mis-use of ether_addr_equal
> 
>  drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 +-
>  drivers/net/ethernet/intel/fm10k/fm10k_pf.c  | 2 +-
>  drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +-
>  drivers/net/ethernet/intel/fm10k/fm10k_vf.c  | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)

Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>

[Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

[Keller, Jacob E]

On Mon, 2015-11-16 at 15:33 -0800, Jacob Keller wrote:
> When comparing MAC addresses, use ether_addr_equal instead of memcmp
> to
> ETH_ALEN length. Found and replaced using the following sed:
> 
> ?sed -e 's/memcmp\x28\(.*\),
> ETH_ALEN\x29/!ether_addr_equal\x28\1\x29/'
> 
> Reported-by: Bruce Allan <bruce.w.allan@intel.com>
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> ---
> 
> Notes:
> 
> ????This replaces the version on the queue inline and corrects issues
> ????with all 4 tests that were replaced. It should fix the mailbox
> ????ethtool test among other possible issues.
> 
> ????- v2
> ????* correct sed expression and fix mis-use of ether_addr_equal


Testing Hints:

1) run the mailbox offline test on a VF
2) try to change VF mac address once it's been assigned by PF, this
should have been broken without this patch, and fixed now.

I think these are the two major things that were broken.

Regards,
Jake

[Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

[Singh, Krishneil K]

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Monday, November 16, 2015 3:34 PM
To: Intel Wired LAN <intel-wired-lan@lists.osuosl.org>
Subject: [Intel-wired-lan] [PATCH v2] fm10k: use ether_addr_equal instead of memcmp

When comparing MAC addresses, use ether_addr_equal instead of memcmp to ETH_ALEN length. Found and replaced using the following sed:

 sed -e 's/memcmp\x28\(.*\), ETH_ALEN\x29/!ether_addr_equal\x28\1\x29/'

Reported-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>