diff options
| author |   Magnus Damm <damm@opensource.se> | 2006-12-13 19:46:53 +0900 |
|---|---|---|
| committer |   Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-28 18:02:50 +0100 |
| commit | 0bdf9b3dd3cfa5cbd5d55172c19f5dd166208e17 (patch) | |
| tree | a7af14eb0601a443343240cbb11d7693db9de352 /drivers/net/pcmcia/pcnet_cs.c | |
| parent | pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page() (diff) | |
| download | linux-dev-0bdf9b3dd3cfa5cbd5d55172c19f5dd166208e17.tar.xz linux-dev-0bdf9b3dd3cfa5cbd5d55172c19f5dd166208e17.zip | |
pcmcia: Change window_handle_t logic to unsigned long
Logic changes based on top of the other patches:
This set of patches changed window_handle_t from being a pointer to an
unsigned long. The unsigned long is now a simple index into socket->win[].
Going from a pointer to unsigned long should leave the user space interface
unchanged unless I'm mistaken.
This change results in code that is less error prone and a user space
interface which is much cleaner and safer. A nice side effect is that we
are also are able to remove all members except one from window_t.
[ linux@dominikbrodowski.net:
Update to 2.6.31. Also, a plain "index" to socket->win[] does not
work, as several codepaths rely on "window_handle_t" being
non-zero if used. Therefore, set the window_handle_t to the
socket->win[] index + 1. ]
CC: netdev@vger.kernel.org
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 75e68946455e..518b094c9f6d 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c @@ -1514,7 +1514,7 @@ static int setup_shmem_window(struct pcmcia_device *link, int start_pg, if (i != (TX_PAGES<<8)) { iounmap(info->base); pcmcia_release_window(link, link->win); - info->base = NULL; link->win = NULL; + info->base = NULL; link->win = 0; goto failed; } |