Skip to content

Commit

Permalink
net/mlx4_en: Use generic etherdevice.h functions.
Browse files Browse the repository at this point in the history
Get rid of full_mac, zero_mac in favour of
is_zero_ether_addr and is_broadcast_ether_addr.

Signed-off-by: Yan Burman <yanb@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Yan Burman authored and David S. Miller committed Dec 12, 2012
1 parent d4676ea commit c402b94
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,6 @@ static int mlx4_en_validate_flow(struct net_device *dev,
struct ethtool_usrip4_spec *l3_mask;
struct ethtool_tcpip4_spec *l4_mask;
struct ethhdr *eth_mask;
u64 full_mac = ~0ull;
u64 zero_mac = 0;

if (cmd->fs.location >= MAX_NUM_OF_FS_RULES)
return -EINVAL;
Expand Down Expand Up @@ -644,11 +642,11 @@ static int mlx4_en_validate_flow(struct net_device *dev,
case ETHER_FLOW:
eth_mask = &cmd->fs.m_u.ether_spec;
/* source mac mask must not be set */
if (memcmp(eth_mask->h_source, &zero_mac, ETH_ALEN))
if (!is_zero_ether_addr(eth_mask->h_source))
return -EINVAL;

/* dest mac mask must be ff:ff:ff:ff:ff:ff */
if (memcmp(eth_mask->h_dest, &full_mac, ETH_ALEN))
if (!is_broadcast_ether_addr(eth_mask->h_dest))
return -EINVAL;

if (!all_zeros_or_all_ones(eth_mask->h_proto))
Expand Down

0 comments on commit c402b94

Please sign in to comment.