1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 7e40741fb7d..9ee873e872b 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -436,8 +436,9 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                 /* Initialize page allocators */
                 err = mlx4_en_init_allocator(priv, ring);
                 if (err) {
-                         mlx4_err(mdev, "Failed initializing ring allocator\n");
-                         goto err_allocator;
+                        mlx4_err(mdev, "Failed initializing ring allocator\n");
+                        ring_ind--;
+                        goto err_allocator;
                 }
 
                 /* Fill Rx buffers */
@@ -467,6 +468,7 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                                      ring->wqres.db.dma, &ring->srq);
                 if (err){
                         mlx4_err(mdev, "Failed to allocate srq\n");
+                        ring_ind--;
                         goto err_srq;
                 }
                 ring->srq.event = mlx4_en_srq_event;
@@ -608,6 +610,10 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv,
                 used_frags = mlx4_en_complete_rx_desc(priv, rx_desc, skb_frags,
                                                       skb_shinfo(skb)->frags,
                                                       page_alloc, length);
+                if (unlikely(!used_frags)) {
+                        kfree_skb(skb);
+                        return NULL;
+                }
                 skb_shinfo(skb)->nr_frags = used_frags;
 
                 /* Copy headers into the skb linear buffer */
@@ -926,12 +932,6 @@ void mlx4_en_set_default_rss_map(struct mlx4_en_priv *priv,
         }
 }
 
-static void mlx4_en_sqp_event(struct mlx4_qp *qp, enum mlx4_event event)
-{
-    return;
-}
-
-
 static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
                                  int qpn, int srqn, int cqn,
                                  enum mlx4_qp_state *state,
@@ -951,7 +951,6 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
         if (err) {
                 mlx4_err(mdev, "Failed to allocate qp #%d\n", qpn);
                 goto out;
-                return err;
         }
         qp->event = mlx4_en_sqp_event;