Patchwork [PATH,net-next,v1,2/2] net/mlx4_en: Fix compilation error when CONFIG_INET isn't defined

login
register
mail settings
Submitter Amir Vadai
Date Feb. 4, 2013, 1:01 p.m.
Message ID <1359982881-10139-3-git-send-email-amirv@mellanox.com>
Download mbox | patch
Permalink /patch/217907/
State Accepted
Delegated to: David Miller
Headers show

Comments

Amir Vadai - Feb. 4, 2013, 1:01 p.m.
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>
---
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
David Miller - Feb. 4, 2013, 6:33 p.m.
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

Patch

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,