Message ID | 1359982881-10139-3-git-send-email-amirv@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Amir Vadai <amirv@mellanox.com> Date: Mon, 4 Feb 2013 15:01:21 +0200 > From: Hadar Hen Zion <hadarh@mellanox.com> > > ip_eth_mc_map function can't be used when CONFIG_INET isn't defined. > Fixed compilation error by adding CONFIG_INET define check before using the > function. > > Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index 3e993d5..f523f02 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c @@ -711,6 +711,7 @@ static int mlx4_en_ethtool_add_mac_rule_by_ipv4(struct mlx4_en_priv *priv, struct mlx4_spec_list *spec_l2, __be32 ipv4_dst) { +#ifdef CONFIG_INET __be64 be_mac = 0; unsigned char mac[ETH_ALEN]; @@ -726,6 +727,9 @@ static int mlx4_en_ethtool_add_mac_rule_by_ipv4(struct mlx4_en_priv *priv, } return mlx4_en_ethtool_add_mac_rule(cmd, rule_list_h, spec_l2, &mac[0]); +#else + return -EINVAL; +#endif } static int add_ip_rule(struct mlx4_en_priv *priv,