Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / net / wireless / airo.c

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 8ae838d96a9ea120b51f9e9248f5ca9291466ca5..17c40f06f13e585a96e5e0db137d25534eae1036 100644 (file)
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1231,7 +1231,7 @@ struct airo_info {
        dma_addr_t              shared_dma;
        pm_message_t            power;
        SsidRid                 *SSID;
-       APListRid               *APList;
+       APListRid               APList;
 #define        PCI_SHARED_LEN          2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE
        char                    proc_name[IFNAMSIZ];
 
@@ -1848,11 +1848,6 @@ static int readStatusRid(struct airo_info *ai, StatusRid *statr, int lock)
        return PC4500_readrid(ai, RID_STATUS, statr, sizeof(*statr), lock);
 }
 
-static int readAPListRid(struct airo_info *ai, APListRid *aplr)
-{
-       return PC4500_readrid(ai, RID_APLIST, aplr, sizeof(*aplr), 1);
-}
-
 static int writeAPListRid(struct airo_info *ai, APListRid *aplr, int lock)
 {
        return PC4500_writerid(ai, RID_APLIST, aplr, sizeof(*aplr), lock);
@@ -2413,7 +2408,6 @@ void stop_airo_card( struct net_device *dev, int freeres )
 
        kfree(ai->flash);
        kfree(ai->rssi);
-       kfree(ai->APList);
        kfree(ai->SSID);
        if (freeres) {
                /* PCMCIA frees this stuff, so only for PCI and ISA */
@@ -2809,6 +2803,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
        init_waitqueue_head (&ai->thr_wait);
        ai->tfm = NULL;
        add_airo_dev(ai);
+       ai->APList.len = cpu_to_le16(sizeof(struct APListRid));
 
        if (airo_networks_allocate (ai))
                goto err_out_free;
@@ -3042,6 +3037,11 @@ static void airo_process_scan_results (struct airo_info *ai) {
        }
 
 out:
+       /* write APList back (we cleared it in airo_set_scan) */
+       disable_MAC(ai, 2);
+       writeAPListRid(ai, &ai->APList, 0);
+       enable_MAC(ai, 0);
+
        ai->scan_timeout = 0;
        clear_bit(JOB_SCAN_RESULTS, &ai->jobs);
        up(&ai->sem);
@@ -3613,17 +3613,18 @@ static void disable_MAC( struct airo_info *ai, int lock ) {
         Cmd cmd;
        Resp rsp;
 
-       if (lock && down_interruptible(&ai->sem))
+       if (lock == 1 && down_interruptible(&ai->sem))
                return;
 
        if (test_bit(FLAG_ENABLED, &ai->flags)) {
-               netif_carrier_off(ai->dev);
+               if (lock != 2) /* lock == 2 means don't disable carrier */
+                       netif_carrier_off(ai->dev);
                memset(&cmd, 0, sizeof(cmd));
                cmd.cmd = MAC_DISABLE; // disable in case already enabled
                issuecommand(ai, &cmd, &rsp);
                clear_bit(FLAG_ENABLED, &ai->flags);
        }
-       if (lock)
+       if (lock == 1)
                up(&ai->sem);
 }
 
@@ -3852,8 +3853,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                tdsRssiRid rssi_rid;
                CapabilityRid cap_rid;
 
-               kfree(ai->APList);
-               ai->APList = NULL;
                kfree(ai->SSID);
                ai->SSID = NULL;
                // general configuration (read/modify/write)
@@ -5130,31 +5129,31 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) {
        struct proc_data *data = file->private_data;
        struct net_device *dev = PDE_DATA(inode);
        struct airo_info *ai = dev->ml_priv;
-       APListRid APList_rid;
+       APListRid *APList_rid = &ai->APList;
        int i;
 
        if ( !data->writelen ) return;
 
-       memset( &APList_rid, 0, sizeof(APList_rid) );
-       APList_rid.len = cpu_to_le16(sizeof(APList_rid));
+       memset(APList_rid, 0, sizeof(*APList_rid));
+       APList_rid->len = cpu_to_le16(sizeof(*APList_rid));
 
        for( i = 0; i < 4 && data->writelen >= (i+1)*6*3; i++ ) {
                int j;
                for( j = 0; j < 6*3 && data->wbuffer[j+i*6*3]; j++ ) {
                        switch(j%3) {
                        case 0:
-                               APList_rid.ap[i][j/3]=
+                               APList_rid->ap[i][j/3]=
                                        hex_to_bin(data->wbuffer[j+i*6*3])<<4;
                                break;
                        case 1:
-                               APList_rid.ap[i][j/3]|=
+                               APList_rid->ap[i][j/3]|=
                                        hex_to_bin(data->wbuffer[j+i*6*3]);
                                break;
                        }
                }
        }
        disable_MAC(ai, 1);
-       writeAPListRid(ai, &APList_rid, 1);
+       writeAPListRid(ai, APList_rid, 1);
        enable_MAC(ai, 1);
 }
 
@@ -5408,7 +5407,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
        struct airo_info *ai = dev->ml_priv;
        int i;
        char *ptr;
-       APListRid APList_rid;
+       APListRid *APList_rid = &ai->APList;
 
        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
@@ -5426,13 +5425,12 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
        }
        data->on_close = proc_APList_on_close;
 
-       readAPListRid(ai, &APList_rid);
        ptr = data->rbuffer;
        for( i = 0; i < 4; i++ ) {
 // We end when we find a zero MAC
-               if ( !*(int*)APList_rid.ap[i] &&
-                    !*(int*)&APList_rid.ap[i][2]) break;
-               ptr += sprintf(ptr, "%pM\n", APList_rid.ap[i]);
+               if ( !*(int*)APList_rid->ap[i] &&
+                    !*(int*)&APList_rid->ap[i][2]) break;
+               ptr += sprintf(ptr, "%pM\n", APList_rid->ap[i]);
        }
        if (i==0) ptr += sprintf(ptr, "Not using specific APs\n");
 
@@ -5596,15 +5594,10 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        Cmd cmd;
        Resp rsp;
 
-       if (!ai->APList)
-               ai->APList = kmalloc(sizeof(APListRid), GFP_KERNEL);
-       if (!ai->APList)
-               return -ENOMEM;
        if (!ai->SSID)
                ai->SSID = kmalloc(sizeof(SsidRid), GFP_KERNEL);
        if (!ai->SSID)
                return -ENOMEM;
-       readAPListRid(ai, ai->APList);
        readSsidRid(ai, ai->SSID);
        memset(&cmd, 0, sizeof(cmd));
        /* the lock will be released at the end of the resume callback */
@@ -5652,11 +5645,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
                kfree(ai->SSID);
                ai->SSID = NULL;
        }
-       if (ai->APList) {
-               writeAPListRid(ai, ai->APList, 0);
-               kfree(ai->APList);
-               ai->APList = NULL;
-       }
+       writeAPListRid(ai, &ai->APList, 0);
        writeConfigRid(ai, 0);
        enable_MAC(ai, 0);
        ai->power = PMSG_ON;
@@ -5954,7 +5943,7 @@ static int airo_set_wap(struct net_device *dev,
        struct airo_info *local = dev->ml_priv;
        Cmd cmd;
        Resp rsp;
-       APListRid APList_rid;
+       APListRid *APList_rid = &local->APList;
 
        if (awrq->sa_family != ARPHRD_ETHER)
                return -EINVAL;
@@ -5967,11 +5956,11 @@ static int airo_set_wap(struct net_device *dev,
                issuecommand(local, &cmd, &rsp);
                up(&local->sem);
        } else {
-               memset(&APList_rid, 0, sizeof(APList_rid));
-               APList_rid.len = cpu_to_le16(sizeof(APList_rid));
-               memcpy(APList_rid.ap[0], awrq->sa_data, ETH_ALEN);
+               memset(APList_rid, 0, sizeof(*APList_rid));
+               APList_rid->len = cpu_to_le16(sizeof(*APList_rid));
+               memcpy(APList_rid->ap[0], awrq->sa_data, ETH_ALEN);
                disable_MAC(local, 1);
-               writeAPListRid(local, &APList_rid, 1);
+               writeAPListRid(local, APList_rid, 1);
                enable_MAC(local, 1);
        }
        return 0;
@@ -7233,6 +7222,7 @@ static int airo_set_scan(struct net_device *dev,
        Cmd cmd;
        Resp rsp;
        int wake = 0;
+       APListRid APList_rid_empty;
 
        /* Note : you may have realised that, as this is a SET operation,
         * this is privileged and therefore a normal user can't
@@ -7250,6 +7240,13 @@ static int airo_set_scan(struct net_device *dev,
        if (ai->scan_timeout > 0)
                goto out;
 
+       /* Clear APList as it affects scan results */
+       memset(&APList_rid_empty, 0, sizeof(APList_rid_empty));
+       APList_rid_empty.len = cpu_to_le16(sizeof(APList_rid_empty));
+       disable_MAC(ai, 2);
+       writeAPListRid(ai, &APList_rid_empty, 0);
+       enable_MAC(ai, 0);
+
        /* Initiate a scan command */
        ai->scan_timeout = RUN_AT(3*HZ);
        memset(&cmd, 0, sizeof(cmd));
@@ -7505,10 +7502,8 @@ static int airo_config_commit(struct net_device *dev,
         * parameters. It's now time to commit them in the card */
        disable_MAC(local, 1);
        if (test_bit (FLAG_RESET, &local->flags)) {
-               APListRid APList_rid;
                SsidRid SSID_rid;
 
-               readAPListRid(local, &APList_rid);
                readSsidRid(local, &SSID_rid);
                if (test_bit(FLAG_MPI,&local->flags))
                        setup_card(local, dev->dev_addr, 1 );
@@ -7516,7 +7511,7 @@ static int airo_config_commit(struct net_device *dev,
                        reset_airo_card(dev);
                disable_MAC(local, 1);
                writeSsidRid(local, &SSID_rid, 1);
-               writeAPListRid(local, &APList_rid, 1);
+               writeAPListRid(local, &local->APList, 1);
        }
        if (down_interruptible(&local->sem))
                return -ERESTARTSYS;