diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-02 18:56:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-02 18:56:49 -0500 |
| commit | 455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch) | |
| tree | 6ff12c853b4a26612ceea8191a8eae29b130b670 /drivers/net | |
| parent | 3ab0b245aa550ea4670d096092ca8e8d5e14ac89 (diff) | |
| parent | 115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/marvell/skge.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_cq.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index d957b2cf0869..b3f636813089 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -2606,6 +2606,9 @@ static int skge_up(struct net_device *dev) spin_unlock_irq(&hw->hw_lock); napi_enable(&skge->napi); + + skge_set_multicast(dev); + return 0; free_tx_ring: diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c index 2d1a34267b80..00b81272e314 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c @@ -144,6 +144,7 @@ void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq) mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size); if (priv->mdev->dev->caps.comp_pool && cq->vector) mlx4_release_eq(priv->mdev->dev, cq->vector); + cq->vector = 0; cq->buf_size = 0; cq->buf = NULL; } |