diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:33:35 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:33:35 -0400 |
| commit | 7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100 (patch) | |
| tree | 4184f2a7d58ba1a1729225404e52d9a89463dd77 /drivers/net/wireless/prism54/islpci_dev.c | |
| parent | a47e9209485243afb4f002b8c3d76d1990b09d0a (diff) | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| download | linux-stable-7d2d8259a2a3078c629b6ee9d4a7ae3ef74ac100.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_dev.c')
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 5ddf29599032..ab3c5a27efd9 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c @@ -715,7 +715,7 @@ islpci_alloc_memory(islpci_private *priv) } prism54_acl_init(&priv->acl); - prism54_wpa_ie_init(priv); + prism54_wpa_bss_ie_init(priv); if (mgt_init(priv)) goto out_free; @@ -774,7 +774,7 @@ islpci_free_memory(islpci_private *priv) /* Free the acces control list and the WPA list */ prism54_acl_clean(&priv->acl); - prism54_wpa_ie_clean(priv); + prism54_wpa_bss_ie_clean(priv); mgt_clean(priv); return 0; |