| Message ID | 20180620120153.11676-1-ville.syrjala@linux.intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | r8169: Fix netpoll oops | expand |
On 20.06.2018 14:01, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Pass the correct thing to rtl8169_interrupt() from netpoll. > Indeed, this place I missed to change. Only small remark: The patch should be annotated as "net" so that it can go to 4.18. > Cc: Realtek linux nic maintainers <nic_swsd@realtek.com> > Cc: netdev@vger.kernel.org > Cc: Heiner Kallweit <hkallweit1@gmail.com> > Cc: David S. Miller <davem@davemloft.net> > Fixes: ebcd5daa7ffd ("r8169: change interrupt handler argument type") > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/net/ethernet/realtek/r8169.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c > index 75dfac0248f4..f4cae2be0fda 100644 > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -7148,7 +7148,7 @@ static void rtl8169_netpoll(struct net_device *dev) > { > struct rtl8169_private *tp = netdev_priv(dev); > > - rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev); > + rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), tp); > } > #endif > >
From: Ville Syrjala <ville.syrjala@linux.intel.com> Date: Wed, 20 Jun 2018 15:01:53 +0300 > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Pass the correct thing to rtl8169_interrupt() from netpoll. > > Cc: Realtek linux nic maintainers <nic_swsd@realtek.com> > Cc: netdev@vger.kernel.org > Cc: Heiner Kallweit <hkallweit1@gmail.com> > Cc: David S. Miller <davem@davemloft.net> > Fixes: ebcd5daa7ffd ("r8169: change interrupt handler argument type") > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Applied.
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 75dfac0248f4..f4cae2be0fda 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7148,7 +7148,7 @@ static void rtl8169_netpoll(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); - rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), dev); + rtl8169_interrupt(pci_irq_vector(tp->pci_dev, 0), tp); } #endif