diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2014-12-02 18:07:18 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-09 13:13:39 -0500 |
| commit | 54ceb9ec6fe8e64067b164e6b161dd63905c059f (patch) | |
| tree | 0351fc9013b4ce8ac3b79a709fd3ead907428a47 /drivers/net | |
| parent | 9cdfe2c709c4f6076249ced6844b2bea420739c4 (diff) | |
amd-xgbe: IRQ names require allocated memory
When requesting an irq, the name passed in must be (part of) allocated
memory. The irq name was a local variable and resulted in random
characters when listing /proc/interrupts. Add a character field to the
xgbe_channel structure to hold the irq name and use that.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -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) struct xgbe_hw_if *hw_if = &pdata->hw_if; struct xgbe_desc_if *desc_if = &pdata->desc_if; struct xgbe_channel *channel = NULL; - char dma_irq_name[IFNAMSIZ + 32]; unsigned int i = 0; int ret; @@ -1341,13 +1340,14 @@ static int xgbe_open(struct net_device *netdev) if (pdata->per_channel_irq) { channel = pdata->channel; for (i = 0; i < pdata->channel_count; i++, channel++) { - snprintf(dma_irq_name, sizeof(dma_irq_name) - 1, + snprintf(channel->dma_irq_name, + sizeof(channel->dma_irq_name) - 1, "%s-TxRx-%u", netdev_name(netdev), channel->queue_index); ret = devm_request_irq(pdata->dev, channel->dma_irq, - xgbe_dma_isr, 0, dma_irq_name, - channel); + xgbe_dma_isr, 0, + channel->dma_irq_name, channel); if (ret) { netdev_alert(netdev, "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 { /* Per channel interrupt irq number */ int dma_irq; + char dma_irq_name[IFNAMSIZ + 32]; /* Netdev related settings */ struct napi_struct napi; |