[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <47A0A5B0.8090605@intel.com>
Date: Wed, 30 Jan 2008 08:28:32 -0800
From: "Kok, Auke" <auke-jan.h.kok@...el.com>
To: Jiri Slaby <jirislaby@...il.com>, Jeff Garzik <jeff@...zik.org>
CC: linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
auke-jan.h.kok@...el.com, jesse.brandeburg@...el.com,
jeffrey.t.kirsher@...el.com, john.ronciak@...el.com,
e1000-devel@...ts.sourceforge.net, venkatesh.pallipadi@...el.com
Subject: Re: [PATCH 1/1] Net: e100, fix iomap mem accesses
Jiri Slaby wrote:
> Patch against netdev-2.6 follows.
> --
> writeX functions are not permitted on iomap-ped space change to iowriteX,
> also pci_unmap pci_map-ped space on exit (instead of iounmap).
>
> Signed-off-by: Jiri Slaby <jirislaby@...il.com>
> ---
> drivers/net/e100.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/e100.c b/drivers/net/e100.c
> index 51cf577..47548ef 100644
> --- a/drivers/net/e100.c
> +++ b/drivers/net/e100.c
> @@ -1904,7 +1904,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
>
> if(restart_required) {
> // ack the rnr?
> - writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
> + iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
> e100_start_receiver(nic, rx_to_start);
> if(work_done)
> (*work_done)++;
> @@ -2706,7 +2706,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
> struct nic *nic = netdev_priv(netdev);
> unregister_netdev(netdev);
> e100_free(nic);
> - iounmap(nic->csr);
> + pci_iounmap(pdev, nic->csr);
> free_netdev(netdev);
> pci_release_regions(pdev);
> pci_disable_device(pdev);
Acked-By: Auke Kok <auke-jan.h.kok@...el.com>
Jeff, feel free to merge in upstream-fixes.
Cheers,
Auke
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists