Re: [PATCH] pci-skeleton: Misc fixes to build neatly

Previous thread: [BNX2]: Fix driver software flag namespace. by David Miller on Monday, January 21, 2008 - 9:17 pm. (3 messages)

Next thread: [IPV4] ip_gre: should take care of CONFIG_IPV6_MODULE by Eric Dumazet on Tuesday, January 22, 2008 - 3:51 am. (3 messages)
To: <jeff@...>
Cc: <netdev@...>, <linux-kernel@...>
Date: Tuesday, January 22, 2008 - 2:16 am

Hello Jeff,

The pci-skeleton.c has several problems with compilation, such as missing args
when calling synchronize_irq(). Fix it.

Signed-off-by: Jike Song <albcamus@gmail.com>
---
drivers/net/pci-skeleton.c | 49 ++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index ed402e0..fffc49b 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -541,7 +541,7 @@ static void netdrv_hw_start (struct net_device *dev);
#define NETDRV_W32_F(reg, val32) do { writel ((val32), ioaddr +
(reg)); readl (ioaddr + (reg)); } while (0)

-#if MMIO_FLUSH_AUDIT_COMPLETE
+#ifdef MMIO_FLUSH_AUDIT_COMPLETE

/* write MMIO register */
#define NETDRV_W8(reg, val8) writeb ((val8), ioaddr + (reg))
@@ -603,7 +603,7 @@ static int __devinit netdrv_init_board (struct
pci_dev *pdev,
return -ENOMEM;
}
SET_NETDEV_DEV(dev, &pdev->dev);
- tp = dev->priv;
+ tp = netdev_priv(dev);

/* enable device (incl. PCI PM wakeup), and bus-mastering */
rc = pci_enable_device (pdev);
@@ -759,7 +759,7 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
return i;
}

- tp = dev->priv;
+ tp = netdev_priv(dev);

assert (ioaddr != NULL);
assert (dev != NULL);
@@ -783,7 +783,7 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
dev->base_addr = (unsigned long) ioaddr;

/* dev->priv/tp zeroed and aligned in alloc_etherdev */
- tp = dev->priv;
+ tp = netdev_priv(dev);

/* note: tp->chipset set in netdrv_init_board */
tp->drv_flags = PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
@@ -841,7 +841,7 @@ static void __devexit netdrv_remove_one (struct
pci_dev *pdev)

assert (dev != NULL);

- np = dev->priv;
+ np = netdev_priv(dev);
assert (np != NULL);

unregister_netdev (dev);
@@ -974,7 +974,7 @@ static void mdio_sync (void *mdio_addr)

static int mdio_read (struct net_device *dev, int phy_id...

To: Jike Song <albcamus@...>
Cc: <netdev@...>, <linux-kernel@...>
Date: Wednesday, January 23, 2008 - 5:59 am

ACK but git-am (everybody's patch import tool) says the patch is corrupted

--

To: Jeff Garzik <jeff@...>
Cc: <netdev@...>, <linux-kernel@...>
Date: Wednesday, January 23, 2008 - 6:16 am

Hi Jeff,

Thank you very much for your acknowledgement! This is my first patch
for Linux kernel, sorry for the corruption. I'll resend it ASAP.

Regards,
Jike
--

Previous thread: [BNX2]: Fix driver software flag namespace. by David Miller on Monday, January 21, 2008 - 9:17 pm. (3 messages)

Next thread: [IPV4] ip_gre: should take care of CONFIG_IPV6_MODULE by Eric Dumazet on Tuesday, January 22, 2008 - 3:51 am. (3 messages)