Changeset 19324

Timestamp:

06/05/12 02:24:19 (12 months ago)

Author:

BrainSlayer

Message:

3.3.8-rc1 -> 3.3.8

Location:

src/linux/universal/linux-3.3

Files:

• .config_mr3240 (added)
• Makefile (modified) (1 diff)
• arch/x86/boot/compressed/relocs.c (deleted)
• drivers/md/raid0.c (modified) (2 diffs)
• drivers/net/wireless/ipw2x00/ipw2200.c (modified) (3 diffs)
• drivers/net/wireless/iwlwifi/iwl-6000.c (modified) (2 diffs)
• drivers/net/wireless/rtlwifi/rtl8192de/sw.c (modified) (3 diffs)
• drivers/spi/spi-fsl-spi.c (modified) (1 diff)

src/linux/universal/linux-3.3/Makefile

@@ -2 +2 @@
 PATCHLEVEL = 3
 SUBLEVEL = 8
-EXTRAVERSION = -rc1
+EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 

src/linux/universal/linux-3.3/drivers/md/raid0.c

@@ -610 +610 @@
 {
         struct r0conf *priv_conf;
+        int chunksect;
 
         /* Check layout:
@@ -620 +621 @@
         }
 
+        /*
+         * a raid1 doesn't have the notion of chunk size, so
+         * figure out the largest suitable size we can use.
+         */
+        chunksect = 64 * 2; /* 64K by default */
+
+        /* The array must be an exact multiple of chunksize */
+        while (chunksect && (mddev->array_sectors & (chunksect - 1)))
+                chunksect >>= 1;
+
+        if ((chunksect << 9) < PAGE_SIZE)
+                /* array size does not allow a suitable chunk size */
+                return ERR_PTR(-EINVAL);
+
         /* Set new parameters */
         mddev->new_level = 0;
         mddev->new_layout = 0;
-        mddev->new_chunk_sectors = 128; /* by default set chunk size to 64k */
+        mddev->new_chunk_sectors = chunksect;
+        mddev->chunk_sectors = chunksect;
         mddev->delta_disks = 1 - mddev->raid_disks;
         mddev->raid_disks = 1;

src/linux/universal/linux-3.3/drivers/net/wireless/ipw2x00/ipw2200.c

@@ -11444 +11444 @@
 }
 
+/* Called by register_netdev() */
+static int ipw_net_init(struct net_device *dev)
+{
+        int rc = 0;
+        struct ipw_priv *priv = libipw_priv(dev);
+
+        mutex_lock(&priv->mutex);
+        if (ipw_up(priv))
+                rc = -EIO;
+        mutex_unlock(&priv->mutex);
+
+        return rc;
+}
+
 static int ipw_wdev_init(struct net_device *dev)
 {
@@ -11709 +11723 @@
 
 static const struct net_device_ops ipw_netdev_ops = {
+        .ndo_init               = ipw_net_init,
         .ndo_open               = ipw_net_open,
         .ndo_stop               = ipw_net_stop,
@@ -11833 +11848 @@
                 mutex_unlock(&priv->mutex);
                 goto out_release_irq;
-        }
-
-        if (ipw_up(priv)) {
-                mutex_unlock(&priv->mutex);
-                err = -EIO;
-                goto out_remove_sysfs;
         }
 

src/linux/universal/linux-3.3/drivers/net/wireless/iwlwifi/iwl-6000.c

@@ -352 +352 @@
         .fw_name_pre = IWL6005_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
-        .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
+        .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
         .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
@@ -392 +392 @@
         .fw_name_pre = IWL6030_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
-        .ucode_api_ok = IWL6000G2_UCODE_API_OK,                 \
+        .ucode_api_ok = IWL6000G2B_UCODE_API_OK,                \
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,               \
         .eeprom_ver = EEPROM_6030_EEPROM_VERSION,               \

src/linux/universal/linux-3.3/drivers/net/wireless/rtlwifi/rtl8192de/sw.c

@@ -95 +95 @@
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        static int header_print;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -175 +174 @@
                 skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
 
-        /* Only load firmware for first MAC */
-        if (header_print)
-                return 0;
-
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
@@ -190 +185 @@
         pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
         pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
-        header_print++;
 
         /* request fw */

src/linux/universal/linux-3.3/drivers/spi/spi-fsl-spi.c

@@ -140 +140 @@
 {
         struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master);
-        struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data;
+        struct fsl_spi_platform_data *pdata;
         bool pol = spi->mode & SPI_CS_HIGH;
         struct spi_mpc8xxx_cs   *cs = spi->controller_state;
+
+        pdata = spi->dev.parent->parent->platform_data;
 
         if (value == BITBANG_CS_INACTIVE) {