History

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. ====================

David S. Miller committed 11 years ago

Commit 7c0004d2 parents 3e4336a 2439fc41 file · +3 −1Browse files

Unified · Split

drivers/net/ethernet/intel/igb/igb_main.c+3−1
@@ -1036,7 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx) · 1035 unmodified lines
1036 adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;1036 adapter->tx_ring[q_vector->tx.ring->queue_index] = NULL;
1037 1037
1038 if (q_vector->rx.ring)1038 if (q_vector->rx.ring)
1039 adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;1039 adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
1040 1040
1041 netif_napi_del(&q_vector->napi);1041 netif_napi_del(&q_vector->napi);
1042 1042
@@ -1207,6 +1207,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, · 164 unmodified lines
1207 q_vector = adapter->q_vector[v_idx];1207 q_vector = adapter->q_vector[v_idx];
1208 if (!q_vector)1208 if (!q_vector)
1209 q_vector = kzalloc(size, GFP_KERNEL);1209 q_vector = kzalloc(size, GFP_KERNEL);
1210 else
1211 memset(q_vector, 0, size);
1210 if (!q_vector)1212 if (!q_vector)
1211 return -ENOMEM;1213 return -ENOMEM;
1212 1214