]> err.no Git - linux-2.6/commitdiff
PS3: gelic: Kill the static bounce buffer
authorMasakazu Mokuno <mokuno@sm.sony.co.jp>
Fri, 30 May 2008 07:27:42 +0000 (16:27 +0900)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jun 2008 19:00:27 +0000 (15:00 -0400)
As the bounce buffer is allocaetd dynamically, kill the static bounce buffer.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/ps3_gelic_wireless.c
drivers/net/ps3_gelic_wireless.h

index c16a30b28bf6069228f83b3d0bc14d0bcd4a5568..4bc6eaae23cafb450b8d91d316bfa672c70a3e68 100644 (file)
@@ -2472,16 +2472,9 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card)
        BUILD_BUG_ON(PAGE_SIZE <
                     sizeof(struct gelic_eurus_scan_info) *
                     GELIC_EURUS_MAX_SCAN);
-       wl->buf = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!wl->buf) {
-               pr_info("%s:buffer allocation failed\n", __func__);
-               goto fail_getpage;
-       }
        pr_debug("%s:end\n", __func__);
        return netdev;
 
-fail_getpage:
-       destroy_workqueue(wl->event_queue);
 fail_event_workqueue:
        destroy_workqueue(wl->eurus_cmd_queue);
 fail_cmd_workqueue:
@@ -2500,8 +2493,6 @@ static void gelic_wl_free(struct gelic_wl_info *wl)
 
        pr_debug("%s: <-\n", __func__);
 
-       free_page((unsigned long)wl->buf);
-
        pr_debug("%s: destroy queues\n", __func__);
        destroy_workqueue(wl->eurus_cmd_queue);
        destroy_workqueue(wl->event_queue);
index bc730632da5b7dbb1291b2785d63524959200374..5339e0078d180a885f53a622dddac4c4743c50ee 100644 (file)
@@ -288,9 +288,6 @@ struct gelic_wl_info {
        u8 active_bssid[ETH_ALEN]; /* associated bssid */
        unsigned int essid_len;
 
-       /* buffer for hypervisor IO */
-       void *buf;
-
        struct iw_public_data wireless_data;
        struct iw_statistics iwstat;
 };