diff options
-rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 02c104dc2aa4..bedfdb1c430d 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |||
@@ -1285,7 +1285,6 @@ static int xgbe_open(struct net_device *netdev) | |||
1285 | struct xgbe_hw_if *hw_if = &pdata->hw_if; | 1285 | struct xgbe_hw_if *hw_if = &pdata->hw_if; |
1286 | struct xgbe_desc_if *desc_if = &pdata->desc_if; | 1286 | struct xgbe_desc_if *desc_if = &pdata->desc_if; |
1287 | struct xgbe_channel *channel = NULL; | 1287 | struct xgbe_channel *channel = NULL; |
1288 | char dma_irq_name[IFNAMSIZ + 32]; | ||
1289 | unsigned int i = 0; | 1288 | unsigned int i = 0; |
1290 | int ret; | 1289 | int ret; |
1291 | 1290 | ||
@@ -1341,13 +1340,14 @@ static int xgbe_open(struct net_device *netdev) | |||
1341 | if (pdata->per_channel_irq) { | 1340 | if (pdata->per_channel_irq) { |
1342 | channel = pdata->channel; | 1341 | channel = pdata->channel; |
1343 | for (i = 0; i < pdata->channel_count; i++, channel++) { | 1342 | for (i = 0; i < pdata->channel_count; i++, channel++) { |
1344 | snprintf(dma_irq_name, sizeof(dma_irq_name) - 1, | 1343 | snprintf(channel->dma_irq_name, |
1344 | sizeof(channel->dma_irq_name) - 1, | ||
1345 | "%s-TxRx-%u", netdev_name(netdev), | 1345 | "%s-TxRx-%u", netdev_name(netdev), |
1346 | channel->queue_index); | 1346 | channel->queue_index); |
1347 | 1347 | ||
1348 | ret = devm_request_irq(pdata->dev, channel->dma_irq, | 1348 | ret = devm_request_irq(pdata->dev, channel->dma_irq, |
1349 | xgbe_dma_isr, 0, dma_irq_name, | 1349 | xgbe_dma_isr, 0, |
1350 | channel); | 1350 | channel->dma_irq_name, channel); |
1351 | if (ret) { | 1351 | if (ret) { |
1352 | netdev_alert(netdev, | 1352 | netdev_alert(netdev, |
1353 | "error requesting irq %d\n", | 1353 | "error requesting irq %d\n", |
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index eb3387398c6f..f9ec762ac3f0 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h | |||
@@ -400,6 +400,7 @@ struct xgbe_channel { | |||
400 | 400 | ||
401 | /* Per channel interrupt irq number */ | 401 | /* Per channel interrupt irq number */ |
402 | int dma_irq; | 402 | int dma_irq; |
403 | char dma_irq_name[IFNAMSIZ + 32]; | ||
403 | 404 | ||
404 | /* Netdev related settings */ | 405 | /* Netdev related settings */ |
405 | struct napi_struct napi; | 406 | struct napi_struct napi; |