diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-07 15:52:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-07 15:52:33 -0500 |
| commit | c5b156794736142fa3120d488f260ff26da3d134 (patch) | |
| tree | aea8161b5ec5c7f9ffa6aa6e001f5a3f5ac32603 /drivers/net/ethernet/mellanox/mlx4/pd.c | |
| parent | 43b18db8a27fcd28c2bd290adf031ca04ea573ce (diff) | |
| parent | a229e488ac3f904d06c20d8d3f47831db3c7a15a (diff) | |
| download | op-kernel-dev-c5b156794736142fa3120d488f260ff26da3d134.zip op-kernel-dev-c5b156794736142fa3120d488f260ff26da3d134.tar.gz | |
Merge branch 'mlx4'
Or Gerlitz says:
====================
Here's a batch of fixes to the mlx4 core and ethernet drivers for 3.9
The commit that disabled RFS when running in SRIOV mode fixes a regression which was
introduced in 3.9-rc1 but actually present also in the 3.8 -stable series. It turns out
that a slightly different fix is needed there and we will generate and submit it there.
Patches done against net commit 66d29cbc59433 "benet: Wait f/w POST until timeout"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/pd.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/pd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/pd.c b/drivers/net/ethernet/mellanox/mlx4/pd.c index 1ac8863..00f223a 100644 --- a/drivers/net/ethernet/mellanox/mlx4/pd.c +++ b/drivers/net/ethernet/mellanox/mlx4/pd.c @@ -101,7 +101,7 @@ void __mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn) void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn) { - u64 in_param; + u64 in_param = 0; int err; if (mlx4_is_mfunc(dev)) { |
