Merge branch 'master'

1 files changed, 23 insertions, 34 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index cb429e783749..849ac88bcccc 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -35,6 +35,7 @@
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/bitops.h>
+#include <linux/scatterlist.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
@@ -1590,11 +1591,9 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, struct
                 aes_counter[12] = (u8)(counter >> 24);
                 counter++;
                 memcpy (plain, aes_counter, 16);
-                sg[0].page = virt_to_page(plain);
-                sg[0].offset = ((long) plain & ~PAGE_MASK);
-                sg[0].length = 16;
+                sg_set_buf(sg, plain, 16);
                 crypto_cipher_encrypt(tfm, sg, sg, 16);
-                cipher = kmap(sg[0].page) + sg[0].offset;
+                cipher = kmap(sg->page) + sg->offset;
                 for (j=0; (j<16) && (i< (sizeof(context->coeff)/sizeof(context->coeff[0]))); ) {
                         context->coeff[i++] = ntohl(*(u32 *)&cipher[j]);
                         j += 4;
@@ -2041,7 +2040,7 @@ static int mpi_send_packet (struct net_device *dev)
         return 1;
 }
 
-static void get_tx_error(struct airo_info *ai, u32 fid)
+static void get_tx_error(struct airo_info *ai, s32 fid)
 {
         u16 status;
 
@@ -2381,14 +2380,10 @@ void stop_airo_card( struct net_device *dev, int freeres )
                         dev_kfree_skb(skb);
         }
 
-        if (ai->flash)
-                kfree(ai->flash);
-        if (ai->rssi)
-                kfree(ai->rssi);
-        if (ai->APList)
-                kfree(ai->APList);
-        if (ai->SSID)
-                kfree(ai->SSID);
+        kfree(ai->flash);
+        kfree(ai->rssi);
+        kfree(ai->APList);
+        kfree(ai->SSID);
         if (freeres) {
                 /* PCMCIA frees this stuff, so only for PCI and ISA */
                 release_region( dev->base_addr, 64 );
@@ -3626,10 +3621,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
         int rc;
 
         memset( &mySsid, 0, sizeof( mySsid ) );
-        if (ai->flash) {
-                kfree (ai->flash);
-                ai->flash = NULL;
-        }
+        kfree (ai->flash);
+        ai->flash = NULL;
 
         /* The NOP is the first step in getting the card going */
         cmd.cmd = NOP;
@@ -3666,14 +3659,10 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                 tdsRssiRid rssi_rid;
                 CapabilityRid cap_rid;
 
-                if (ai->APList) {
-                        kfree(ai->APList);
-                        ai->APList = NULL;
-                }
-                if (ai->SSID) {
-                        kfree(ai->SSID);
-                        ai->SSID = NULL;
-                }
+                kfree(ai->APList);
+                ai->APList = NULL;
+                kfree(ai->SSID);
+                ai->SSID = NULL;
                 // general configuration (read/modify/write)
                 status = readConfigRid(ai, lock);
                 if ( status != SUCCESS ) return ERROR;
@@ -3687,10 +3676,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                                 memcpy(ai->rssi, (u8*)&rssi_rid + 2, 512); /* Skip RID length member */
                 }
                 else {
-                        if (ai->rssi) {
-                                kfree(ai->rssi);
-                                ai->rssi = NULL;
-                        }
+                        kfree(ai->rssi);
+                        ai->rssi = NULL;
                         if (cap_rid.softCap & 8)
                                 ai->config.rmode |= RXMODE_NORMALIZED_RSSI;
                         else
@@ -5369,11 +5356,13 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
 
 static int proc_close( struct inode *inode, struct file *file )
 {
-        struct proc_data *data = (struct proc_data *)file->private_data;
-        if ( data->on_close != NULL ) data->on_close( inode, file );
-        if ( data->rbuffer ) kfree( data->rbuffer );
-        if ( data->wbuffer ) kfree( data->wbuffer );
-        kfree( data );
+        struct proc_data *data = file->private_data;
+
+        if (data->on_close != NULL)
+                data->on_close(inode, file);
+        kfree(data->rbuffer);
+        kfree(data->wbuffer);
+        kfree(data);
         return 0;
 }