From 9b71a8cf766a193249a5434fdd0afd5e601d85e7 Mon Sep 17 00:00:00 2001 From: Hadar Hen Zion Date: Mon, 4 Feb 2013 03:01:21 +0000 Subject: [PATCH] --- yaml --- r: 352068 b: refs/heads/master c: f9d96862cacd1177d76d82f70f88ac57cb05e6e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b4115cf32f1..eba6c318cfa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 377d97393d93cca146937058986050a30857eec7 +refs/heads/master: f9d96862cacd1177d76d82f70f88ac57cb05e6e0 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c index 3e993d5a1994..f523f0204f1f 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +++ b/trunk/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,