Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 61 insertions, 81 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 1d05445d4ba3..55cf71fbffe3 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -105,7 +105,7 @@ static struct pci_driver airo_driver = {
    of statistics in the /proc filesystem */
 
 #define IGNLABEL(comment) NULL
-static char *statsLabels[] = {
+static const char *statsLabels[] = {
         "RxOverrun",
         IGNLABEL("RxPlcpCrcErr"),
         IGNLABEL("RxPlcpFormatErr"),
@@ -217,7 +217,6 @@ static char *statsLabels[] = {
    (no spaces) list of rates (up to 8). */
 
 static int rates[8];
-static int basic_rate;
 static char *ssids[3];
 
 static int io[4];
@@ -243,29 +242,29 @@ static int airo_perm = 0555;
 static int proc_perm = 0644;
 
 MODULE_AUTHOR("Benjamin Reed");
-MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet \
-cards.  Direct support for ISA/PCI/MPI cards and support \
-for PCMCIA when used with airo_cs.");
+MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards.  "
+                   "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");
 module_param_array(io, int, NULL, 0);
 module_param_array(irq, int, NULL, 0);
-module_param(basic_rate, int, 0);
 module_param_array(rates, int, NULL, 0);
 module_param_array(ssids, charp, NULL, 0);
 module_param(auto_wep, int, 0);
-MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \
-the authentication options until an association is made.  The value of \
-auto_wep is number of the wep keys to check.  A value of 2 will try using \
-the key at index 0 and index 1.");
+MODULE_PARM_DESC(auto_wep,
+                 "If non-zero, the driver will keep looping through the authentication options until an association is made.  "
+                 "The value of auto_wep is number of the wep keys to check.  "
+                 "A value of 2 will try using the key at index 0 and index 1.");
 module_param(aux_bap, int, 0);
-MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \
-than seems to work better for older cards with some older buses.  Before \
-switching it checks that the switch is needed.");
+MODULE_PARM_DESC(aux_bap,
+                 "If non-zero, the driver will switch into a mode that seems to work better for older cards with some older buses.  "
+                 "Before switching it checks that the switch is needed.");
 module_param(maxencrypt, int, 0);
-MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \
-encryption.  Units are in 512kbs.  Zero (default) means there is no limit. \
-Older cards used to be limited to 2mbs (4).");
+MODULE_PARM_DESC(maxencrypt,
+                 "The maximum speed that the card can do encryption.  "
+                 "Units are in 512kbs.  "
+                 "Zero (default) means there is no limit.  "
+                 "Older cards used to be limited to 2mbs (4).");
 module_param(adhoc, int, 0);
 MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode.");
 module_param(probe, int, 0);
@@ -932,7 +931,7 @@ typedef struct aironet_ioctl {
         unsigned char __user *data;     // d-data
 } aironet_ioctl;
 
-static char swversion[] = "2.1";
+static const char swversion[] = "2.1";
 #endif /* CISCO_EXT */
 
 #define NUM_MODULES       2
@@ -1374,7 +1373,7 @@ static int micsetup(struct airo_info *ai) {
         return SUCCESS;
 }
 
-static char micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
+static const u8 micsnap[] = {0xAA,0xAA,0x03,0x00,0x40,0x96,0x00,0x02};
 
 /*===========================================================================
  * Description: Mic a packet
@@ -1886,7 +1885,7 @@ static int airo_open(struct net_device *dev) {
         /* Make sure the card is configured.
          * Wireless Extensions may postpone config changes until the card
          * is open (to pipeline changes and speed-up card setup). If
-         * those changes are not yet commited, do it now - Jean II */
+         * those changes are not yet committed, do it now - Jean II */
         if (test_bit(FLAG_COMMIT, &ai->flags)) {
                 disable_MAC(ai, 1);
                 writeConfigRid(ai, 1);
@@ -1994,7 +1993,7 @@ static int mpi_send_packet (struct net_device *dev)
 /*
  * Magic, the cards firmware needs a length count (2 bytes) in the host buffer
  * right after  TXFID_HDR.The TXFID_HDR contains the status short so payloadlen
- * is immediatly after it. ------------------------------------------------
+ * is immediately after it. ------------------------------------------------
  *                         |TXFIDHDR+STATUS|PAYLOADLEN|802.3HDR|PACKETDATA|
  *                         ------------------------------------------------
  */
@@ -2008,7 +2007,7 @@ static int mpi_send_packet (struct net_device *dev)
                 sizeof(wifictlhdr8023) + 2 ;
 
         /*
-         * Firmware automaticly puts 802 header on so
+         * Firmware automatically puts 802 header on so
          * we don't need to account for it in the length
          */
         if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled &&
@@ -2533,7 +2532,7 @@ static int mpi_init_descriptors (struct airo_info *ai)
 /*
  * We are setting up three things here:
  * 1) Map AUX memory for descriptors: Rid, TxFid, or RxFid.
- * 2) Map PCI memory for issueing commands.
+ * 2) Map PCI memory for issuing commands.
  * 3) Allocate memory (shared) to send and receive ethernet frames.
  */
 static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci)
@@ -2723,9 +2722,8 @@ static int airo_networks_allocate(struct airo_info *ai)
         if (ai->networks)
                 return 0;
 
-        ai->networks =
-            kzalloc(AIRO_MAX_NETWORK_COUNT * sizeof(BSSListElement),
-                    GFP_KERNEL);
+        ai->networks = kcalloc(AIRO_MAX_NETWORK_COUNT, sizeof(BSSListElement),
+                               GFP_KERNEL);
         if (!ai->networks) {
                 airo_print_warn("", "Out of memory allocating beacons");
                 return -ENOMEM;
@@ -3884,15 +3882,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                                 ai->config.rates[i] = rates[i];
                         }
                 }
-                if ( basic_rate > 0 ) {
-                        for( i = 0; i < 8; i++ ) {
-                                if ( ai->config.rates[i] == basic_rate ||
-                                     !ai->config.rates ) {
-                                        ai->config.rates[i] = basic_rate | 0x80;
-                                        break;
-                                }
-                        }
-                }
                 set_bit (FLAG_COMMIT, &ai->flags);
         }
 
@@ -3959,7 +3948,7 @@ static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {
 
         if ( max_tries == -1 ) {
                 airo_print_err(ai->dev->name,
-                        "Max tries exceeded when issueing command");
+                        "Max tries exceeded when issuing command");
                 if (IN4500(ai, COMMAND) & COMMAND_BUSY)
                         OUT4500(ai, EVACK, EV_CLEARCOMMANDBUSY);
                 return ERROR;
@@ -4185,7 +4174,7 @@ done:
 }
 
 /*  Note, that we are using BAP1 which is also used by transmit, so
- *  make sure this isnt called when a transmit is happening */
+ *  make sure this isn't called when a transmit is happening */
 static int PC4500_writerid(struct airo_info *ai, u16 rid,
                            const void *pBuf, int len, int lock)
 {
@@ -4430,21 +4419,24 @@ static const struct file_operations proc_statsdelta_ops = {
         .owner          = THIS_MODULE,
         .read           = proc_read,
         .open           = proc_statsdelta_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_stats_ops = {
         .owner          = THIS_MODULE,
         .read           = proc_read,
         .open           = proc_stats_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_status_ops = {
         .owner          = THIS_MODULE,
         .read           = proc_read,
         .open           = proc_status_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_SSID_ops = {
@@ -4452,7 +4444,8 @@ static const struct file_operations proc_SSID_ops = {
         .read           = proc_read,
         .write          = proc_write,
         .open           = proc_SSID_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_BSSList_ops = {
@@ -4460,7 +4453,8 @@ static const struct file_operations proc_BSSList_ops = {
         .read           = proc_read,
         .write          = proc_write,
         .open           = proc_BSSList_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_APList_ops = {
@@ -4468,7 +4462,8 @@ static const struct file_operations proc_APList_ops = {
         .read           = proc_read,
         .write          = proc_write,
         .open           = proc_APList_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_config_ops = {
@@ -4476,7 +4471,8 @@ static const struct file_operations proc_config_ops = {
         .read           = proc_read,
         .write          = proc_write,
         .open           = proc_config_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static const struct file_operations proc_wepkey_ops = {
@@ -4484,7 +4480,8 @@ static const struct file_operations proc_wepkey_ops = {
         .read           = proc_read,
         .write          = proc_write,
         .open           = proc_wepkey_open,
-        .release        = proc_close
+        .release        = proc_close,
+        .llseek         = default_llseek,
 };
 
 static struct proc_dir_entry *airo_entry;
@@ -4504,17 +4501,15 @@ static int setup_proc_entry( struct net_device *dev,
         struct proc_dir_entry *entry;
         /* First setup the device directory */
         strcpy(apriv->proc_name,dev->name);
-        apriv->proc_entry = create_proc_entry(apriv->proc_name,
-                                              S_IFDIR|airo_perm,
-                                              airo_entry);
+        apriv->proc_entry = proc_mkdir_mode(apriv->proc_name, airo_perm,
+                                            airo_entry);
         if (!apriv->proc_entry)
                 goto fail;
         apriv->proc_entry->uid = proc_uid;
         apriv->proc_entry->gid = proc_gid;
 
         /* Setup the StatsDelta */
-        entry = proc_create_data("StatsDelta",
-                                 S_IFREG | (S_IRUGO&proc_perm),
+        entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
                                  apriv->proc_entry, &proc_statsdelta_ops, dev);
         if (!entry)
                 goto fail_stats_delta;
@@ -4522,8 +4517,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the Stats */
-        entry = proc_create_data("Stats",
-                                 S_IFREG | (S_IRUGO&proc_perm),
+        entry = proc_create_data("Stats", S_IRUGO & proc_perm,
                                  apriv->proc_entry, &proc_stats_ops, dev);
         if (!entry)
                 goto fail_stats;
@@ -4531,8 +4525,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the Status */
-        entry = proc_create_data("Status",
-                                 S_IFREG | (S_IRUGO&proc_perm),
+        entry = proc_create_data("Status", S_IRUGO & proc_perm,
                                  apriv->proc_entry, &proc_status_ops, dev);
         if (!entry)
                 goto fail_status;
@@ -4540,8 +4533,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the Config */
-        entry = proc_create_data("Config",
-                                 S_IFREG | proc_perm,
+        entry = proc_create_data("Config", proc_perm,
                                  apriv->proc_entry, &proc_config_ops, dev);
         if (!entry)
                 goto fail_config;
@@ -4549,8 +4541,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the SSID */
-        entry = proc_create_data("SSID",
-                                 S_IFREG | proc_perm,
+        entry = proc_create_data("SSID", proc_perm,
                                  apriv->proc_entry, &proc_SSID_ops, dev);
         if (!entry)
                 goto fail_ssid;
@@ -4558,8 +4549,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the APList */
-        entry = proc_create_data("APList",
-                                 S_IFREG | proc_perm,
+        entry = proc_create_data("APList", proc_perm,
                                  apriv->proc_entry, &proc_APList_ops, dev);
         if (!entry)
                 goto fail_aplist;
@@ -4567,8 +4557,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the BSSList */
-        entry = proc_create_data("BSSList",
-                                 S_IFREG | proc_perm,
+        entry = proc_create_data("BSSList", proc_perm,
                                  apriv->proc_entry, &proc_BSSList_ops, dev);
         if (!entry)
                 goto fail_bsslist;
@@ -4576,8 +4565,7 @@ static int setup_proc_entry( struct net_device *dev,
         entry->gid = proc_gid;
 
         /* Setup the WepKey */
-        entry = proc_create_data("WepKey",
-                                 S_IFREG | proc_perm,
+        entry = proc_create_data("WepKey", proc_perm,
                                  apriv->proc_entry, &proc_wepkey_ops, dev);
         if (!entry)
                 goto fail_wepkey;
@@ -4656,24 +4644,18 @@ static ssize_t proc_write( struct file *file,
                            size_t len,
                            loff_t *offset )
 {
-        loff_t pos = *offset;
+        ssize_t ret;
         struct proc_data *priv = file->private_data;
 
         if (!priv->wbuffer)
                 return -EINVAL;
 
-        if (pos < 0)
-                return -EINVAL;
-        if (pos >= priv->maxwritelen)
-                return 0;
-        if (len > priv->maxwritelen - pos)
-                len = priv->maxwritelen - pos;
-        if (copy_from_user(priv->wbuffer + pos, buffer, len))
-                return -EFAULT;
-        if ( pos + len > priv->writelen )
-                priv->writelen = len + file->f_pos;
-        *offset = pos + len;
-        return len;
+        ret = simple_write_to_buffer(priv->wbuffer, priv->maxwritelen, offset,
+                                        buffer, len);
+        if (ret > 0)
+                priv->writelen = max_t(int, priv->writelen, *offset);
+
+        return ret;
 }
 
 static int proc_status_open(struct inode *inode, struct file *file)
@@ -4786,7 +4768,7 @@ static int proc_stats_rid_open( struct inode *inode,
                 if (!statsLabels[i]) continue;
                 if (j+strlen(statsLabels[i])+16>4096) {
                         airo_print_warn(apriv->dev->name,
-                               "Potentially disasterous buffer overflow averted!");
+                               "Potentially disastrous buffer overflow averted!");
                         break;
                 }
                 j+=sprintf(data->rbuffer+j, "%s: %u\n", statsLabels[i],
@@ -5024,7 +5006,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file)
         airo_config_commit(dev, NULL, NULL, NULL);
 }
 
-static char *get_rmode(__le16 mode)
+static const char *get_rmode(__le16 mode)
 {
         switch(mode & RXMODE_MASK) {
         case RXMODE_RFMON:  return "rfmon";
@@ -5715,9 +5697,7 @@ static int __init airo_init_module( void )
 {
         int i;
 
-        airo_entry = create_proc_entry("driver/aironet",
-                                       S_IFDIR | airo_perm,
-                                       NULL);
+        airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);
 
         if (airo_entry) {
                 airo_entry->uid = proc_uid;