Commit 7c0004d3 authored by David S. Miller's avatar David S. Miller

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-05-07

This series contains updates to igb only.

Toshiaki provides two fixes for igb, first fixes an issue when changing
the number of rings by ethtool which causes oops because of uninitialized
pointers.  The second fix resolves a typo where tx_ring was used instead
of the desired rx_ring.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3e4336a6 2439fc4d
...@@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx) ...@@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL; adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
if (q_vector->rx.ring) if (q_vector->rx.ring)
adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL; adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
netif_napi_del(&q_vector->napi); netif_napi_del(&q_vector->napi);
...@@ -1207,6 +1207,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, ...@@ -1207,6 +1207,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
q_vector = adapter->q_vector[v_idx]; q_vector = adapter->q_vector[v_idx];
if (!q_vector) if (!q_vector)
q_vector = kzalloc(size, GFP_KERNEL); q_vector = kzalloc(size, GFP_KERNEL);
else
memset(q_vector, 0, size);
if (!q_vector) if (!q_vector)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment