Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-09-07 21:41:53 -07:00
parent 97a13e5289 d030671f3f
commit eb84d6b604
694 changed files with 6362 additions and 3447 deletions
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -171,7 +171,7 @@ static struct xgbe_channel *xgbe_alloc_rings(struct xgbe_prv_data *pdata)
 		}

 		if (i < pdata->rx_ring_count) {
-			spin_lock_init(&tx_ring->lock);
+			spin_lock_init(&rx_ring->lock);
 			channel->rx_ring = rx_ring++;
 		}