From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Joe Perches <joe@perches.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 01/13] i40e: use ether_addr_equal_64bits
Date: Wed, 5 Mar 2014 20:21:32 -0800 [thread overview]
Message-ID: <1394079704-1108-2-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1394079704-1108-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Joe Perches <joe@perches.com>
All ether_addr_equal tests in i40e can use the
slightly more efficient ether_addr_equal_64bits.
All addresses passed to the various functions that
use ether_addr_equal are using structs that have 2
or more bytes of additional data after the mac addr
being tested.
struct i40e_mac_filter.macaddr[6] (followed by s16 vlan)
struct net_device.dev_addr (pointer to char array of MAX_ADDR_LEN)
struct sockaddr.sa_data (array of 14 bytes)
struct netdev_hw_addr.addr (pointer to char array of MAX_ADDR_LEN)
Signed-off-by: Joe Perches <joe@perches.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 53f3ed2..5157922 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -997,7 +997,7 @@ static struct i40e_mac_filter *i40e_find_filter(struct i40e_vsi *vsi,
return NULL;
list_for_each_entry(f, &vsi->mac_filter_list, list) {
- if ((ether_addr_equal(macaddr, f->macaddr)) &&
+ if (ether_addr_equal_64bits(macaddr, f->macaddr) &&
(vlan == f->vlan) &&
(!is_vf || f->is_vf) &&
(!is_netdev || f->is_netdev))
@@ -1025,7 +1025,7 @@ struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,
return NULL;
list_for_each_entry(f, &vsi->mac_filter_list, list) {
- if ((ether_addr_equal(macaddr, f->macaddr)) &&
+ if (ether_addr_equal_64bits(macaddr, f->macaddr) &&
(!is_vf || f->is_vf) &&
(!is_netdev || f->is_netdev))
return f;
@@ -1214,7 +1214,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
netdev_info(netdev, "set mac address=%pM\n", addr->sa_data);
- if (ether_addr_equal(netdev->dev_addr, addr->sa_data))
+ if (ether_addr_equal_64bits(netdev->dev_addr, addr->sa_data))
return 0;
if (test_bit(__I40E_DOWN, &vsi->back->state) ||
@@ -1417,21 +1417,24 @@ static void i40e_set_rx_mode(struct net_device *netdev)
if (is_multicast_ether_addr(f->macaddr)) {
netdev_for_each_mc_addr(mca, netdev) {
- if (ether_addr_equal(mca->addr, f->macaddr)) {
+ if (ether_addr_equal_64bits(mca->addr,
+ f->macaddr)) {
found = true;
break;
}
}
} else {
netdev_for_each_uc_addr(uca, netdev) {
- if (ether_addr_equal(uca->addr, f->macaddr)) {
+ if (ether_addr_equal_64bits(uca->addr,
+ f->macaddr)) {
found = true;
break;
}
}
for_each_dev_addr(netdev, ha) {
- if (ether_addr_equal(ha->addr, f->macaddr)) {
+ if (ether_addr_equal_64bits(ha->addr,
+ f->macaddr)) {
found = true;
break;
}
@@ -1905,7 +1908,8 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)
list_for_each_entry(f, &vsi->mac_filter_list, list) {
if (is_netdev) {
if (f->vlan &&
- ether_addr_equal(netdev->dev_addr, f->macaddr))
+ ether_addr_equal_64bits(netdev->dev_addr,
+ f->macaddr))
filter_count++;
}
--
1.8.3.1
next prev parent reply other threads:[~2014-03-06 4:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-06 4:21 [net-next 00/13][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-03-06 4:21 ` Jeff Kirsher [this message]
2014-03-06 4:35 ` [net-next 01/13] i40e: use ether_addr_equal_64bits Joe Perches
2014-03-06 4:40 ` Jeff Kirsher
[not found] ` <CAP-MU4Nf=T-BZDpHnBzq8xcPf7CG3v2oMSD3fitAKXp=fP4XPw@mail.gmail.com>
2014-03-06 19:33 ` Jeff Kirsher
2014-03-06 20:45 ` David Miller
2014-03-06 4:21 ` [net-next 02/13] i40evf: Enable the ndo_set_features netdev op Jeff Kirsher
2014-03-06 4:21 ` [net-next 03/13] i40e: Flow Director sideband accounting Jeff Kirsher
2014-03-09 18:35 ` Ben Hutchings
2014-03-06 4:21 ` [net-next 04/13] i40e: Prevent overflow due to kzalloc Jeff Kirsher
2014-03-06 4:21 ` [net-next 05/13] i40e/i40evf: i40e implementation for skb_set_hash Jeff Kirsher
2014-03-06 4:21 ` [net-next 06/13] i40e: clean up comment style Jeff Kirsher
2014-03-06 4:21 ` [net-next 07/13] i40e: Remove a FW workaround for Number of MSIX vectors Jeff Kirsher
2014-03-06 4:21 ` [net-next 08/13] i40e: count timeout events Jeff Kirsher
2014-03-06 4:21 ` [net-next 09/13] i40e: Remove a redundant filter addition Jeff Kirsher
2014-03-06 4:21 ` [net-next 10/13] i40e: Fix static checker warning Jeff Kirsher
2014-03-06 4:21 ` [net-next 11/13] i40e: fix nvm version and remove firmware report Jeff Kirsher
2014-03-06 4:21 ` [net-next 12/13] i40e/i40evf: carefully fill tx ring Jeff Kirsher
2014-03-06 4:21 ` [net-next 13/13] i40e/i40evf: Bump pf&vf build versions Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394079704-1108-2-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=joe@perches.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).