diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-12 05:52:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 05:52:22 -0400 |
| commit | e5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (patch) | |
| tree | 3558f68717c70a67e18c3274bb17709a353d036f /drivers/net/ethernet/mellanox/mlx4/main.c | |
| parent | 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (diff) | |
| parent | 3da889b616164bde76a37350cf28e0d17a94e979 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index d180bc46826..16abde20e1f 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1555,7 +1555,7 @@ void __mlx4_counter_free(struct mlx4_dev *dev, u32 idx) void mlx4_counter_free(struct mlx4_dev *dev, u32 idx) { - u64 in_param; + u64 in_param = 0; if (mlx4_is_mfunc(dev)) { set_param_l(&in_param, idx); |