Skip to content

Commit 2927499

Browse files
hkallweitdavem330
authored andcommitted
r8169: fix interrupt number after adding support for MSI-X interrupts
In case of MSI-X the interrupt number may differ from pcidev->irq. Fix this by using pci_irq_vector(). Fixes: 6c6aa15 ("r8169: improve interrupt handling") Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a6a8f01 commit 2927499

File tree

1 file changed

+3
-2
lines changed
  • drivers/net/ethernet/realtek

1 file changed

+3
-2
lines changed

drivers/net/ethernet/realtek/r8169.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7861,7 +7861,7 @@ static void rtl8169_netpoll(struct net_device *dev)
78617861
{
78627862
struct rtl8169_private *tp = netdev_priv(dev);
78637863

7864-
rtl8169_interrupt(tp->pci_dev->irq, dev);
7864+
rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev);
78657865
}
78667866
#endif
78677867

@@ -8608,7 +8608,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
86088608

86098609
netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
86108610
rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,
8611-
(u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);
8611+
(u32)(RTL_R32(TxConfig) & 0x9cf0f8ff),
8612+
pci_irq_vector(pdev, 0));
86128613
if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {
86138614
netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, "
86148615
"tx checksumming: %s]\n",

0 commit comments

Comments
 (0)