fm10k: use ether_addr_equal instead of memcmp
Subsystems (2)
PATCH v2 1/1 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/'
---
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(-)
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +1 -1
@@ -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 */
drivers/net/ethernet/intel/fm10k/fm10k_pf.c +1 -1
@@ -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 );
drivers/net/ethernet/intel/fm10k/fm10k_tlv.c +1 -1
@@ -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 ;
drivers/net/ethernet/intel/fm10k/fm10k_vf.c +1 -1
@@ -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 */
Signature · 1 line
2.6.3.491.g3e3f6ce
Allan
PATCH v2 1/1 fm10k: use ether_addr_equal instead of memcmp
Quoted 25 lines
-----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: useether_addr_equalinstead of memcmpWhen comparing MAC addresses, use
ether_addr_equalinstead of memcmp toETH_ALENlength. 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 <[email protected]>Signed-off-by Jacob Keller <[email protected]>---
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.
Quoted 8 lines
- v2
* correct sed expression and fix mis-use ofether_addr_equaldrivers/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(-)
Keller
PATCH v2 1/1 fm10k: use ether_addr_equal instead of memcmp
In reply to Jacob KellerQuoted 11 lines · Jacob Keller
When comparing MAC addresses, use
ether_addr_equalinstead of memcmp toETH_ALENlength. 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 <[email protected]>Signed-off-by Jacob Keller <[email protected]>---
Quoted 8 lines
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 ofether_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
Singh
PATCH v2 1/1 fm10k: use ether_addr_equal instead of memcmp
In reply to Jacob Keller-----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 <[email protected]>
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/'
---