Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29274991 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: 6c6aa15f ("r8169: improve interrupt handling")
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6a8f019

drivers/net/ethernet/realtek/r8169.c

+3 −2
Original line number Diff line number Diff line
@@ -7861,7 +7861,7 @@ static void rtl8169_netpoll(struct net_device *dev) 
{

	struct rtl8169_private *tp = netdev_priv(dev);



	rtl8169_interrupt(tp->pci_dev->irq, dev);

	rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev);

}

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


	netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",

		   rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,

		   (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);

		   (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff),

		   pci_irq_vector(pdev, 0));

	if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {

		netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, "

			   "tx checksumming: %s]\n",