[prev in list] [next in list] [prev in thread] [next in thread]
List: moblin-commits
Subject: [Moblin-Commits] linux-2.6.24: Changes to 'master'
From: ftang1 () moblin ! org (Feng Tang)
Date: 2008-04-27 23:34:28
Message-ID: 20080428063426.131A992C07F () moblin ! org
[Download RAW message or body]
debian/changelog | 7 +
debian/patches/0019-marvell_8686_8688.patch | 587 +--------------------------
2 files changed, 20 insertions(+), 574 deletions(-)
New commits:
commit 72eb0e0d1714ecc73de07b7bde94305d67162f04
Author: Feng Tang <feng.tang@intel.com>
Date: Mon Apr 28 14:21:34 2008 +0800
* Remove old ENABLE_PM code
* Change 8686 driver data block size from 32 to 256
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 82fb5d6..f8d8495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kernel-mid-2.6.24 (2.6.24-13) UNRELEASED; urgency=low
+
+ * Remove old ENABLE_PM code
+ * Change 8686 driver data block size from 32 to 256
+
+ -- Feng Tang <feng.tang@intel.com> Mon, 28 Apr 2008 14:20:16 +0800
+
kernel-mid-2.6.24 (2.6.24-12) gaston; urgency=low
* Cutting release v2.6.24-12
diff --git a/debian/patches/0019-marvell_8686_8688.patch \
b/debian/patches/0019-marvell_8686_8688.patch index 6846a69..98d7f3e 100644
--- a/debian/patches/0019-marvell_8686_8688.patch
+++ b/debian/patches/0019-marvell_8686_8688.patch
@@ -1,18 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
diff --git a/drivers/net/wireless/8686_v9/Makefile \
b/drivers/net/wireless/8686_v9/Makefile new file mode 100644
-index 0000000..3bb6046
+index 0000000..9749b2a
--- /dev/null
+++ b/drivers/net/wireless/8686_v9/Makefile
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,79 @@
+CONFIG_DEBUG=0
+
+# Proc in /proc/net/wlan
+CONFIG_PROC_DEBUG=y
+
-+# Linux Power Management
-+CONFIG_ENABLE_PM=n
-+
+# Re-association in driver
+CONFIG_REASSOCIATION=y
+
@@ -49,10 +46,6 @@ index 0000000..3bb6046
+ export CONFIG_PROC_DEBUG
+endif
+
-+ifeq ($(CONFIG_ENABLE_PM),y)
-+ EXTRA_CFLAGS += -DENABLE_PM
-+endif
-+
+ifeq ($(CONFIG_REASSOCIATION),y)
+ EXTRA_CFLAGS += -DREASSOCIATION
+endif
@@ -2014,10 +2007,10 @@ index 0000000..f90922e
+Public License instead of this License.
diff --git a/drivers/net/wireless/8686_v9/if/if_sdio/if_sdio.c \
b/drivers/net/wireless/8686_v9/if/if_sdio/if_sdio.c new file mode 100644
-index 0000000..1f30603
+index 0000000..1f6bb45
--- /dev/null
+++ b/drivers/net/wireless/8686_v9/if/if_sdio/if_sdio.c
-@@ -0,0 +1,1541 @@
+@@ -0,0 +1,1517 @@
+/** @file if_sdio.c
+ * @brief This file contains SDIO IF (interface) module
+ * related functions.
@@ -2056,7 +2049,7 @@ index 0000000..1f30603
+/* define SD block size for firmware download */
+#define SD_BLOCK_SIZE_FW_DL 32
+/* define SD block size for data Tx/Rx */
-+#define SD_BLOCK_SIZE 32
++#define SD_BLOCK_SIZE 256
+
+#define ALLOC_BUF_SIZE (((MAX(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, \
+ MRVDRV_SIZE_OF_CMD_BUFFER) + SDIO_HEADER_LEN \
@@ -3534,31 +3527,7 @@ index 0000000..1f30603
+ return ret;
+}
+
-+#ifdef ENABLE_PM
-+/**
-+ * @brief This function suspends the device.
-+ *
-+ * @param priv A pointer to wlan_private structure
-+ * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE
-+ */
-+int
-+sbi_suspend(wlan_private * priv)
-+{
-+ return sdio_suspend(priv->wlan_dev.card);
-+}
+
-+/**
-+ * @brief This function resumes the device from sleep
-+ *
-+ * @param priv A pointer to wlan_private structure
-+ * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE
-+*/
-+int
-+sbi_resume(wlan_private * priv)
-+{
-+ return sdio_resume(priv->wlan_dev.card);
-+}
-+#endif
diff --git a/drivers/net/wireless/8686_v9/if/if_sdio/if_sdio.h \
b/drivers/net/wireless/8686_v9/if/if_sdio/if_sdio.h new file mode 100644
index 0000000..e60f8f8
@@ -3747,10 +3716,10 @@ index 0000000..a049f18
+#endif /* _OS_HEADER1 */
diff --git a/drivers/net/wireless/8686_v9/os/linux/os_headers.h \
b/drivers/net/wireless/8686_v9/os/linux/os_headers.h new file mode 100644
-index 0000000..59db99f
+index 0000000..55507ba
--- /dev/null
+++ b/drivers/net/wireless/8686_v9/os/linux/os_headers.h
-@@ -0,0 +1,85 @@
+@@ -0,0 +1,80 @@
+/*
+ *
+ * (c) Copyright © 2003-2006, Marvell International Ltd.
@@ -3807,11 +3776,6 @@ index 0000000..59db99f
+
+#include <linux/ioport.h>
+
-+/* New Code to synchronize between IEEE Power save and PM*/
-+#ifdef ENABLE_PM
-+#include <linux/pm.h>
-+#endif
-+
+/* ASM files */
+#include <asm/semaphore.h>
+#include <asm/byteorder.h>
@@ -3836,96 +3800,6 @@ index 0000000..59db99f
+#include <net/iw_handler.h>
+
+#endif
-diff --git a/drivers/net/wireless/8686_v9/os/linux/os_headers.h.bak \
b/drivers/net/wireless/8686_v9/os/linux/os_headers.h.bak
-new file mode 100644
-index 0000000..cfa0a8e
---- /dev/null
-+++ b/drivers/net/wireless/8686_v9/os/linux/os_headers.h.bak
-@@ -0,0 +1,84 @@
-+/*
-+ *
-+ * (c) Copyright © 2003-2006, Marvell International Ltd.
-+ *
-+ * This software file (the "File") is distributed by Marvell International
-+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
-+ * (the "License"). You may use, redistribute and/or modify this File in
-+ * accordance with the terms and conditions of the License, a copy of which
-+ * is available along with the File in the gpl.txt file or by writing to
-+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-+ *
-+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
-+ * this warranty disclaimer.
-+ *
-+ */
-+
-+#ifndef _OS_HEADERS_H
-+#define _OS_HEADERS_H
-+
-+#ifndef __ATTRIB_ALIGN__
-+#define __ATTRIB_ALIGN__ __attribute__((aligned(4)))
-+#endif
-+
-+#ifndef __ATTRIB_PACK__
-+#define __ATTRIB_PACK__ __attribute__ ((packed))
-+#endif
-+
-+/* Linux header files */
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/version.h>
-+#include <linux/param.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/types.h>
-+#include <linux/sched.h>
-+#include <linux/timer.h>
-+#include <linux/types.h>
-+#include <linux/ioport.h>
-+#include <linux/pci.h>
-+#include <linux/ctype.h>
-+#include <linux/proc_fs.h>
-+#include <linux/ptrace.h>
-+#include <linux/string.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#include <linux/config.h>
-+#endif
-+
-+#include <linux/ioport.h>
-+
-+/* New Code to synchronize between IEEE Power save and PM*/
-+#ifdef ENABLE_PM
-+#include <linux/pm.h>
-+#endif
-+
-+/* ASM files */
-+#include <asm/semaphore.h>
-+#include <asm/byteorder.h>
-+#include <asm/irq.h>
-+#include <asm/uaccess.h>
-+#include <asm/io.h>
-+#include <asm/system.h>
-+
-+/* Net header files */
-+#include <linux/wireless.h>
-+#include <linux/netdevice.h>
-+#include <linux/net.h>
-+#include <linux/ip.h>
-+#include <linux/skbuff.h>
-+#include <linux/if_arp.h>
-+#include <linux/if_ether.h>
-+#include <linux/etherdevice.h>
-+#include <net/arp.h>
-+#include <linux/rtnetlink.h>
-+
-+/* Wireless header */
-+#include <net/iw_handler.h>
-+#endif
diff --git a/drivers/net/wireless/8686_v9/os/linux/os_macros.h \
b/drivers/net/wireless/8686_v9/os/linux/os_macros.h new file mode 100644
index 0000000..6478cec
@@ -4139,192 +4013,6 @@ index 0000000..6478cec
+#endif /* end of DBG_2621 */
+
+#endif /* _OS_MACROS_H */
-diff --git a/drivers/net/wireless/8686_v9/os/linux/os_macros.h.bak \
b/drivers/net/wireless/8686_v9/os/linux/os_macros.h.bak
-new file mode 100644
-index 0000000..3270d7a
---- /dev/null
-+++ b/drivers/net/wireless/8686_v9/os/linux/os_macros.h.bak
-@@ -0,0 +1,180 @@
-+/*
-+ *
-+ * (c) Copyright © 2003-2006, Marvell International Ltd.
-+ *
-+ * This software file (the "File") is distributed by Marvell International
-+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
-+ * (the "License"). You may use, redistribute and/or modify this File in
-+ * accordance with the terms and conditions of the License, a copy of which
-+ * is available along with the File in the gpl.txt file or by writing to
-+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
-+ *
-+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
-+ * this warranty disclaimer.
-+ *
-+ */
-+#ifndef _OS_MACROS_H
-+#define _OS_MACROS_H
-+
-+#define os_time_get() jiffies
-+
-+extern spinlock_t driver_lock;
-+extern unsigned long driver_flags;
-+#define OS_INT_DISABLE spin_lock_irqsave(&driver_lock, driver_flags)
-+#define OS_INT_RESTORE spin_unlock_irqrestore(&driver_lock, driver_flags); \
-+ driver_lock = SPIN_LOCK_UNLOCKED
-+
-+#define UpdateTransStart(dev) { \
-+ dev->trans_start = jiffies; \
-+}
-+
-+#define OS_SET_THREAD_STATE(x) set_current_state(x)
-+
-+#define MODULE_GET if(try_module_get(THIS_MODULE)==0) return WLAN_STATUS_FAILURE;
-+#define MODULE_PUT module_put(THIS_MODULE)
-+
-+#define OS_INIT_SEMAPHORE(x) init_MUTEX(x)
-+#define OS_ACQ_SEMAPHORE_BLOCK(x) down_interruptible(x)
-+#define OS_ACQ_SEMAPHORE_NOBLOCK(x) down_trylock(x)
-+#define OS_REL_SEMAPHORE(x) up(x)
-+
-+/* Definitions below are needed for other OS like threadx */
-+#define TX_DISABLE
-+#define TX_RESTORE
-+#define ConfigureThreadPriority()
-+#define OS_INTERRUPT_SAVE_AREA
-+#define OS_FREE_LOCK(x)
-+#define TX_EVENT_FLAGS_SET(x, y, z)
-+
-+#define os_wait_interruptible_timeout(waitq, cond, timeout) \
-+ wait_event_interruptible_timeout(waitq, cond, timeout)
-+
-+static inline void
-+os_sched_timeout(u32 millisec)
-+{
-+ set_current_state(TASK_INTERRUPTIBLE);
-+
-+ schedule_timeout((millisec * HZ) / 1000);
-+}
-+
-+static inline void
-+os_schedule(u32 millisec)
-+{
-+ schedule_timeout((millisec * HZ) / 1000);
-+}
-+
-+static inline int
-+CopyMulticastAddrs(wlan_adapter * Adapter, struct net_device *dev)
-+{
-+ int i = 0;
-+ struct dev_mc_list *mcptr = dev->mc_list;
-+
-+ for (i = 0; i < dev->mc_count; i++) {
-+ memcpy(&Adapter->MulticastList[i], mcptr->dmi_addr, ETH_ALEN);
-+ mcptr = mcptr->next;
-+ }
-+
-+ return i;
-+}
-+
-+static inline u32
-+get_utimeofday(void)
-+{
-+ struct timeval t;
-+ u32 ut;
-+
-+ do_gettimeofday(&t);
-+ ut = (u32) t.tv_sec * 1000000 + ((u32) t.tv_usec);
-+ return ut;
-+}
-+
-+static inline int
-+os_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
-+{
-+
-+#define IPFIELD_ALIGN_OFFSET 2
-+
-+ skb->dev = priv->wlan_dev.netdev;
-+ skb->protocol = eth_type_trans(skb, priv->wlan_dev.netdev);
-+ skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+ netif_rx(skb);
-+
-+ return 0;
-+}
-+
-+static inline void
-+os_free_tx_packet(wlan_private * priv)
-+{
-+ ulong flags;
-+
-+ if (priv->adapter->CurrentTxSkb) {
-+ kfree_skb(priv->adapter->CurrentTxSkb);
-+ spin_lock_irqsave(&priv->adapter->CurrentTxLock, flags);
-+ priv->adapter->CurrentTxSkb = NULL;
-+ spin_unlock_irqrestore(&priv->adapter->CurrentTxLock, flags);
-+ }
-+}
-+
-+/*
-+ * netif carrier_on/off and start(wake)/stop_queue handling
-+ *
-+ * carrier_on carrier_off start_queue stop_queue
-+ * open x(connect) x(disconnect) x
-+ * close x x
-+ * assoc x x
-+ * deauth x x
-+ * adhoc-start
-+ * adhoc-join
-+ * adhoc-link x x
-+ * adhoc-bcnlost x x
-+ * scan-begin x x
-+ * scan-end x x
-+ * ds-enter x x
-+ * ds-exit x x
-+ * xmit x
-+ * xmit-done x
-+ * tx-timeout
-+ */
-+static inline void
-+os_carrier_on(wlan_private * priv)
-+{
-+ if (!netif_carrier_ok(priv->wlan_dev.netdev) &&
-+ (priv->adapter->MediaConnectStatus == WlanMediaStateConnected) &&
-+ ((priv->adapter->InfrastructureMode != Wlan802_11IBSS) ||
-+ (priv->adapter->AdhocLinkSensed))) {
-+ netif_carrier_on(priv->wlan_dev.netdev);
-+ }
-+}
-+
-+static inline void
-+os_carrier_off(wlan_private * priv)
-+{
-+ if (netif_carrier_ok(priv->wlan_dev.netdev)) {
-+ netif_carrier_off(priv->wlan_dev.netdev);
-+ }
-+}
-+
-+static inline void
-+os_start_queue(wlan_private * priv)
-+{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic