Commit 21e197f2 authored by Ivan Vecera's avatar Ivan Vecera Committed by Francois Romieu
Browse files

r8169: fix oops in r8169_get_mac_version 



r8169_get_mac_version crashes when it meets an unknown MAC
due to tp->pci_dev not being set. Initialize it early.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent cee60c37

drivers/net/r8169.c

+1 −1
Original line number Diff line number Diff line
@@ -1617,6 +1617,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	SET_NETDEV_DEV(dev, &pdev->dev);

	tp = netdev_priv(dev);

	tp->dev = dev;

	tp->pci_dev = pdev;

	tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);



	/* enable device (incl. PCI PM wakeup and hotplug setup) */
@@ -1777,7 +1778,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
#endif



	tp->intr_mask = 0xffff;

	tp->pci_dev = pdev;

	tp->mmio_addr = ioaddr;

	tp->align = cfg->align;

	tp->hw_start = cfg->hw_start;