diff options
| -rw-r--r-- | ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch | 29 | ||||
| -rw-r--r-- | compat-move-br_port_exists-to-compat-2_6_36_h.patch | 150 | ||||
| -rw-r--r-- | compat-wireless-config-fixups.patch | 33 | ||||
| -rw-r--r-- | compat-wireless-fix-some-config-options.patch | 137 | ||||
| -rw-r--r-- | compat-wireless-pr_fmt-warning-avoidance.patch | 275 | ||||
| -rw-r--r-- | compat-wireless-use-kconfig_h.patch | 14 | ||||
| -rw-r--r-- | kernel.spec | 14 | ||||
| -rw-r--r-- | sources | 2 |
8 files changed, 109 insertions, 545 deletions
diff --git a/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch b/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch deleted file mode 100644 index 7d5c9a5c8..000000000 --- a/ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41b2d62702730b0c6bc5a40722e423bb0338311a Mon Sep 17 00:00:00 2001 -From: John W. Linville <linville@tuxdriver.com> -Date: Mon, 30 Jan 2012 10:53:55 -0500 -Subject: [PATCH] ath9k: use WARN_ON_ONCE in ath_rc_get_highest_rix - -The device seems to survive the issue, so no need to flood the logs -about it... - -Signed-off-by: John W. Linville <linville@tuxdriver.com> ---- - drivers/net/wireless/ath/ath9k/rc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c -index b3c3798..635b592 100644 ---- a/drivers/net/wireless/ath/ath9k/rc.c -+++ b/drivers/net/wireless/ath/ath9k/rc.c -@@ -694,7 +694,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc, - return rate; - - /* This should not happen */ -- WARN_ON(1); -+ WARN_ON_ONCE(1); - - rate = ath_rc_priv->valid_rate_index[0]; - --- -1.7.4.4 - diff --git a/compat-move-br_port_exists-to-compat-2_6_36_h.patch b/compat-move-br_port_exists-to-compat-2_6_36_h.patch deleted file mode 100644 index f55c9943b..000000000 --- a/compat-move-br_port_exists-to-compat-2_6_36_h.patch +++ /dev/null @@ -1,150 +0,0 @@ -From linux-wireless-owner@vger.kernel.org Thu Jan 26 18:23:05 2012 -Return-Path: linville@tuxdriver.com -Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO - zmta01.collab.prod.int.phx2.redhat.com) (10.5.5.31) by - zmail15.collab.prod.int.phx2.redhat.com with LMTP; Thu, 26 Jan 2012 - 18:23:05 -0500 (EST) -Received: from localhost (localhost.localdomain [127.0.0.1]) by - zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id BEE90114AAB - for <linville@redhat.com>; Thu, 26 Jan 2012 18:23:05 -0500 (EST) -Received: from zmta01.collab.prod.int.phx2.redhat.com ([127.0.0.1]) by - localhost (zmta01.collab.prod.int.phx2.redhat.com [127.0.0.1]) - (amavisd-new, port 10024) with ESMTP id vqGh0M65OdhD for - <linville@redhat.com>; Thu, 26 Jan 2012 18:23:05 -0500 (EST) -Received: from int-mx10.intmail.prod.int.phx2.redhat.com - (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by - zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id AB0BE114A54 - for <linville@mail.corp.redhat.com>; Thu, 26 Jan 2012 18:23:05 -0500 (EST) -Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com - [10.5.110.18]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) - with ESMTP id q0QNN44o004565 for <linville@redhat.com>; Thu, 26 Jan 2012 - 18:23:05 -0500 -Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0QNN2jG004833 for - <linville@redhat.com>; Thu, 26 Jan 2012 18:23:03 -0500 -Received: from sapphire.tuxdriver.com ([70.61.120.61] helo=localhost) by - smtp.tuxdriver.com with esmtp (Exim 4.63) (envelope-from - <linville@tuxdriver.com>) id 1RqYej-0005zd-E7 for linville@redhat.com; Thu, - 26 Jan 2012 18:23:01 -0500 -Resent-From: "John W. Linville" <linville@tuxdriver.com> -Resent-Date: Thu, 26 Jan 2012 18:22:43 -0500 -Resent-Message-ID: <20120126232243.GA2190@tuxdriver.com> -Resent-To: linville@redhat.com -Received: from vger.kernel.org ([209.132.180.67]) by smtp.tuxdriver.com - with esmtp (Exim 4.63) (envelope-from - <linux-wireless-owner@vger.kernel.org>) id 1RqYC2-0005sF-Ja for - linville@tuxdriver.com; Thu, 26 Jan 2012 17:53:25 -0500 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id - S1753594Ab2AZWxH (ORCPT <rfc822;linville@tuxdriver.com>); Thu, 26 Jan 2012 - 17:53:07 -0500 -Received: from server19320154104.serverpool.info ([193.201.54.104]:51996 - "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id - S1753449Ab2AZWxG (ORCPT <rfc822;linux-wireless@vger.kernel.org>); Thu, 26 - Jan 2012 17:53:06 -0500 -Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) - with ESMTP id CCCF88F60; Thu, 26 Jan 2012 23:53:03 +0100 (CET) -X-Virus-Scanned: Debian amavisd-new at hauke-m.de -Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de - [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LKxWWkfakUtI; Thu, 26 - Jan 2012 23:51:49 +0100 (CET) -Received: from localhost.localdomain (unknown [134.102.132.222]) by - hauke-m.de (Postfix) with ESMTPSA id DBFF98F61; Thu, 26 Jan 2012 23:51:48 - +0100 (CET) -From: Hauke Mehrtens <hauke@hauke-m.de> -To: mcgrof@gmail.com, mcgrof@qca.qualcomm.com -Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens <hauke@hauke-m.de> -Subject: [PATCH] compat: move br_port_exists() to compat-2.6.36.h -Date: Thu, 26 Jan 2012 23:51:45 +0100 -Message-Id: <1327618305-23077-1-git-send-email-hauke@hauke-m.de> -Sender: linux-wireless-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-wireless.vger.kernel.org> -X-Mailing-List: linux-wireless@vger.kernel.org -X-Spam-Status: No -X-RedHat-Spam-Score: -0.01 (T_RP_MATCHES_RCVD) -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.18 -X-Evolution-Source: imap://linville@mail.corp.redhat.com/ -Content-Transfer-Encoding: 8bit -Mime-Version: 1.0 - -br_port_exists() was moved to a new compat-*.h file for every new -kernel release, as it is not in mainline. This patch moves it to compat- -2.6.36.h so it has not to be moved any more for a new kernel version. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - include/linux/compat-2.6.36.h | 15 +++++++++++++++ - include/linux/compat-3.3.h | 17 ----------------- - 2 files changed, 15 insertions(+), 17 deletions(-) - -diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h -index b5d9975..314fb35 100644 ---- a/include/linux/compat-2.6.36.h -+++ b/include/linux/compat-2.6.36.h -@@ -142,6 +142,8 @@ extern struct workqueue_struct *system_nrt_wq; - void compat_system_workqueue_create(void); - void compat_system_workqueue_destroy(void); - -+#define br_port_exists(dev) (dev->br_port) -+ - #else - - static inline void compat_system_workqueue_create(void) -@@ -152,6 +154,19 @@ static inline void compat_system_workqueue_destroy(void) - { - } - -+/* -+ * This is not part of The 2.6.37 kernel yet but we -+ * we use it to optimize the backport code we -+ * need to implement. Instead of using ifdefs -+ * to check what version of the check we use -+ * we just replace all checks on current code -+ * with this. I'll submit this upstream too, that -+ * way all we'd have to do is to implement this -+ * for older kernels, then we would not have to -+ * edit the upstrema code for backport efforts. -+ */ -+#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) -+ - #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */ - - #endif /* LINUX_26_36_COMPAT_H */ -diff --git a/include/linux/compat-3.3.h b/include/linux/compat-3.3.h -index 821333c..4965f23 100644 ---- a/include/linux/compat-3.3.h -+++ b/include/linux/compat-3.3.h -@@ -8,23 +8,6 @@ - /* include to override NL80211_FEATURE_SK_TX_STATUS */ - #include <linux/nl80211.h> - --/* -- * This is not part of The 2.6.37 kernel yet but we -- * we use it to optimize the backport code we -- * need to implement. Instead of using ifdefs -- * to check what version of the check we use -- * we just replace all checks on current code -- * with this. I'll submit this upstream too, that -- * way all we'd have to do is to implement this -- * for older kernels, then we would not have to -- * edit the upstrema code for backport efforts. -- */ --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) --#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) --#else --#define br_port_exists(dev) (dev->br_port) --#endif -- - static inline void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) - { - WARN_ON(1); --- -1.7.5.4 - --- -To unsubscribe from this list: send the line "unsubscribe linux-wireless" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - - diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch index fd034b21a..f74dbd2d5 100644 --- a/compat-wireless-config-fixups.patch +++ b/compat-wireless-config-fixups.patch @@ -1,6 +1,6 @@ -diff -up compat-wireless-2012-01-24/config.mk.orig compat-wireless-2012-01-24/config.mk ---- compat-wireless-2012-01-24/config.mk.orig 2012-01-24 16:12:12.000000000 -0500 -+++ compat-wireless-2012-01-24/config.mk 2012-01-25 13:34:20.315899694 -0500 +diff -up compat-wireless-2012-02-05/config.mk.orig compat-wireless-2012-02-05/config.mk +--- compat-wireless-2012-02-05/config.mk.orig 2012-02-05 16:10:31.000000000 -0500 ++++ compat-wireless-2012-02-05/config.mk 2012-02-06 11:43:46.142222712 -0500 @@ -14,6 +14,9 @@ else include $(KLIB_BUILD)/.config endif @@ -11,15 +11,15 @@ diff -up compat-wireless-2012-01-24/config.mk.orig compat-wireless-2012-01-24/co ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) COMPAT_LATEST_VERSION = 3 -diff -up compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile.orig compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile ---- compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile.orig 2012-01-24 16:12:15.000000000 -0500 -+++ compat-wireless-2012-01-24/drivers/misc/eeprom/Makefile 2012-01-25 13:34:20.316899682 -0500 +diff -up compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile.orig compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile +--- compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile.orig 2012-02-05 16:10:39.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/misc/eeprom/Makefile 2012-02-06 11:43:46.143222699 -0500 @@ -1 +1 @@ -obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o +#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o -diff -up compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile ---- compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile.orig 2012-01-24 16:12:13.000000000 -0500 -+++ compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile 2012-01-25 13:34:20.316899682 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile +--- compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile.orig 2012-02-05 16:10:37.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/ethernet/atheros/Makefile 2012-02-06 11:43:46.143222699 -0500 @@ -2,7 +2,7 @@ # Makefile for the Atheros network device drivers. # @@ -32,10 +32,10 @@ diff -up compat-wireless-2012-01-24/drivers/net/ethernet/atheros/Makefile.orig c +#obj-$(CONFIG_ATL2) += atlx/ +#obj-$(CONFIG_ATL1E) += atl1e/ +#obj-$(CONFIG_ATL1C) += atl1c/ -diff -up compat-wireless-2012-01-24/drivers/net/usb/Makefile.orig compat-wireless-2012-01-24/drivers/net/usb/Makefile ---- compat-wireless-2012-01-24/drivers/net/usb/Makefile.orig 2012-01-24 16:12:15.000000000 -0500 -+++ compat-wireless-2012-01-24/drivers/net/usb/Makefile 2012-01-25 13:34:20.316899682 -0500 -@@ -2,7 +2,7 @@ +diff -up compat-wireless-2012-02-05/drivers/net/usb/Makefile.orig compat-wireless-2012-02-05/drivers/net/usb/Makefile +--- compat-wireless-2012-02-05/drivers/net/usb/Makefile.orig 2012-02-05 16:10:39.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/usb/Makefile 2012-02-06 11:45:23.531005184 -0500 +@@ -2,6 +2,6 @@ # Makefile for USB Network drivers # @@ -45,10 +45,9 @@ diff -up compat-wireless-2012-01-24/drivers/net/usb/Makefile.orig compat-wireles +#obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o +#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o +#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o - -diff -up compat-wireless-2012-01-24/Makefile.orig compat-wireless-2012-01-24/Makefile ---- compat-wireless-2012-01-24/Makefile.orig 2012-01-24 16:12:12.000000000 -0500 -+++ compat-wireless-2012-01-24/Makefile 2012-01-25 13:34:58.502422295 -0500 +diff -up compat-wireless-2012-02-05/Makefile.orig compat-wireless-2012-02-05/Makefile +--- compat-wireless-2012-02-05/Makefile.orig 2012-02-05 16:10:31.000000000 -0500 ++++ compat-wireless-2012-02-05/Makefile 2012-02-06 11:43:46.145222675 -0500 @@ -10,8 +10,8 @@ export KLIB_BUILD ?= $(KLIB)/build MODPROBE := /sbin/modprobe diff --git a/compat-wireless-fix-some-config-options.patch b/compat-wireless-fix-some-config-options.patch deleted file mode 100644 index 788e405d6..000000000 --- a/compat-wireless-fix-some-config-options.patch +++ /dev/null @@ -1,137 +0,0 @@ -From linux-wireless-owner@vger.kernel.org Thu Jan 26 18:23:33 2012 -Return-Path: linville@tuxdriver.com -Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO - zmta02.collab.prod.int.phx2.redhat.com) (10.5.5.32) by - zmail15.collab.prod.int.phx2.redhat.com with LMTP; Thu, 26 Jan 2012 - 18:23:33 -0500 (EST) -Received: from localhost (localhost.localdomain [127.0.0.1]) by - zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 3BF74128BE0 - for <linville@redhat.com>; Thu, 26 Jan 2012 18:23:33 -0500 (EST) -Received: from zmta02.collab.prod.int.phx2.redhat.com ([127.0.0.1]) by - localhost (zmta02.collab.prod.int.phx2.redhat.com [127.0.0.1]) - (amavisd-new, port 10024) with ESMTP id 130PQ7pzqAEV for - <linville@redhat.com>; Thu, 26 Jan 2012 18:23:33 -0500 (EST) -Received: from int-mx09.intmail.prod.int.phx2.redhat.com - (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by - zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 24E00128BDF - for <linville@mail.corp.redhat.com>; Thu, 26 Jan 2012 18:23:33 -0500 (EST) -Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com - [10.5.110.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) - with ESMTP id q0QNNXuF014708 for <linville@redhat.com>; Thu, 26 Jan 2012 - 18:23:33 -0500 -Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) - by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0QNNWYF026587 for - <linville@redhat.com>; Thu, 26 Jan 2012 18:23:32 -0500 -Received: from sapphire.tuxdriver.com ([70.61.120.61] helo=localhost) by - smtp.tuxdriver.com with esmtp (Exim 4.63) (envelope-from - <linville@tuxdriver.com>) id 1RqYfD-0005zt-9K for linville@redhat.com; Thu, - 26 Jan 2012 18:23:31 -0500 -Resent-From: "John W. Linville" <linville@tuxdriver.com> -Resent-Date: Thu, 26 Jan 2012 18:23:12 -0500 -Resent-Message-ID: <20120126232312.GB2190@tuxdriver.com> -Resent-To: linville@redhat.com -Received: from vger.kernel.org ([209.132.180.67]) by smtp.tuxdriver.com - with esmtp (Exim 4.63) (envelope-from - <linux-wireless-owner@vger.kernel.org>) id 1RqYEt-0005tm-3A for - linville@tuxdriver.com; Thu, 26 Jan 2012 17:56:21 -0500 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id - S1752042Ab2AZWzw (ORCPT <rfc822;linville@tuxdriver.com>); Thu, 26 Jan 2012 - 17:55:52 -0500 -Received: from server19320154104.serverpool.info ([193.201.54.104]:52032 - "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id - S1751796Ab2AZWzv (ORCPT <rfc822;linux-wireless@vger.kernel.org>); Thu, 26 - Jan 2012 17:55:51 -0500 -Received: from localhost (localhost [127.0.0.1]) by hauke-m.de (Postfix) - with ESMTP id E6CFE8F61; Thu, 26 Jan 2012 23:55:50 +0100 (CET) -X-Virus-Scanned: Debian amavisd-new at hauke-m.de -Received: from hauke-m.de ([127.0.0.1]) by localhost (hauke-m.de - [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HGH3hmHAsDa7; Thu, 26 - Jan 2012 23:55:47 +0100 (CET) -Received: from localhost.localdomain (unknown [134.102.132.222]) by - hauke-m.de (Postfix) with ESMTPSA id F1F248F60; Thu, 26 Jan 2012 23:55:46 - +0100 (CET) -From: Hauke Mehrtens <hauke@hauke-m.de> -To: mcgrof@gmail.com, mcgrof@qca.qualcomm.com -Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens <hauke@hauke-m.de> -Subject: [PATCH] compat-wireless: fix some config options -Date: Thu, 26 Jan 2012 23:55:44 +0100 -Message-Id: <1327618544-23163-1-git-send-email-hauke@hauke-m.de> -Sender: linux-wireless-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-wireless.vger.kernel.org> -X-Mailing-List: linux-wireless@vger.kernel.org -X-Spam-Status: No -X-RedHat-Spam-Score: -0.01 (T_RP_MATCHES_RCVD) -X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 -X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16 -X-Evolution-Source: imap://linville@mail.corp.redhat.com/ -Content-Transfer-Encoding: 8bit -Mime-Version: 1.0 - -Adds some missing config options interceded in the last time and remove -some old now unused config options. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - config.mk | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/config.mk b/config.mk -index 4d2ad5c..9433ce9 100644 ---- a/config.mk -+++ b/config.mk -@@ -281,6 +281,8 @@ CONFIG_ATH9K_COMMON=m - # for long range considerations. - CONFIG_ATH9K_RATE_CONTROL=y - -+CONFIG_ATH9K_BTCOEX_SUPPORT=y -+ - # PCI Drivers - ifdef CONFIG_PCI - -@@ -288,10 +290,10 @@ CONFIG_ATH5K_PCI=y - CONFIG_ATH9K_PCI=y - - CONFIG_IWLWIFI=m -+CONFIG_IWLWIFI_P2P=y - # CONFIG_IWLWIFI_DEBUG=y - # CONFIG_IWLWIFI_DEBUGFS=y - # CONFIG_IWLWIFI_DEVICE_TRACING=y --# CONFIG_IWLWIFI_DEVICE_SVTOOL=y - # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE=y - - CONFIG_IWLEGACY=m -@@ -314,7 +316,6 @@ CONFIG_B43_PHY_LP=y - CONFIG_B43_PHY_N=y - CONFIG_B43_PHY_HT=y - # CONFIG_B43_PHY_LCN=y --# CONFIG_B43_FORCE_PIO=y - # CONFIG_B43_DEBUG=y - - CONFIG_B43LEGACY=m -@@ -375,7 +376,7 @@ CONFIG_BCMA_BLOCKIO=y - CONFIG_BCMA_HOST_PCI=y - # CONFIG_BCMA_DEBUG=y - CONFIG_B43_BCMA=y --CONFIG_B43_BCMA_PIO=y -+CONFIG_B43_BCMA_EXTRA=y - - CONFIG_P54_PCI=m - -@@ -614,6 +615,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27 - - ifndef CONFIG_COMPAT_KERNEL_2_6_29 - CONFIG_BRCMFMAC=m -+CONFIG_BRCMFMAC_SDIO=y - endif #CONFIG_COMPAT_KERNEL_2_6_29 - - endif #CONFIG_MMC --- -1.7.5.4 - --- -To unsubscribe from this list: send the line "unsubscribe linux-wireless" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - - diff --git a/compat-wireless-pr_fmt-warning-avoidance.patch b/compat-wireless-pr_fmt-warning-avoidance.patch index 7ca8f02fc..6dbbc82e8 100644 --- a/compat-wireless-pr_fmt-warning-avoidance.patch +++ b/compat-wireless-pr_fmt-warning-avoidance.patch @@ -1,6 +1,6 @@ -diff -up compat-wireless-2011-12-18/compat/crc8.c.orig compat-wireless-2011-12-18/compat/crc8.c ---- compat-wireless-2011-12-18/compat/crc8.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/compat/crc8.c 2012-01-05 13:40:29.271996550 -0500 +diff -up compat-wireless-2012-02-05/compat/crc8.c.orig compat-wireless-2012-02-05/compat/crc8.c +--- compat-wireless-2012-02-05/compat/crc8.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/compat/crc8.c 2012-02-06 11:53:01.617278318 -0500 @@ -14,6 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ @@ -9,9 +9,9 @@ diff -up compat-wireless-2011-12-18/compat/crc8.c.orig compat-wireless-2011-12-1 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> -diff -up compat-wireless-2011-12-18/drivers/bcma/bcma_private.h.orig compat-wireless-2011-12-18/drivers/bcma/bcma_private.h ---- compat-wireless-2011-12-18/drivers/bcma/bcma_private.h.orig 2011-12-18 16:10:34.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/bcma/bcma_private.h 2012-01-05 13:40:29.271996550 -0500 +diff -up compat-wireless-2012-02-05/drivers/bcma/bcma_private.h.orig compat-wireless-2012-02-05/drivers/bcma/bcma_private.h +--- compat-wireless-2012-02-05/drivers/bcma/bcma_private.h.orig 2012-02-05 16:10:33.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/bcma/bcma_private.h 2012-02-06 11:53:01.618278306 -0500 @@ -1,6 +1,7 @@ #ifndef LINUX_BCMA_PRIVATE_H_ #define LINUX_BCMA_PRIVATE_H_ @@ -20,9 +20,9 @@ diff -up compat-wireless-2011-12-18/drivers/bcma/bcma_private.h.orig compat-wire #ifndef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #endif -diff -up compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c.orig compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c ---- compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c 2012-01-05 13:40:29.273996525 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c.orig compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c +--- compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/ethernet/broadcom/b44.c 2012-02-06 11:53:01.620278282 -0500 @@ -10,6 +10,7 @@ * Distribute under GPL. */ @@ -31,9 +31,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/ethernet/broadcom/b44.c.orig com #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c ---- compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig 2012-01-05 13:44:54.137685272 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2012-01-05 13:44:56.589654617 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +--- compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c.orig 2012-02-05 16:10:33.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c 2012-02-06 11:53:01.621278269 -0500 @@ -16,6 +16,7 @@ * File contents: support functions for PCI/PCIe */ @@ -42,9 +42,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/aiut #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/delay.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c ---- compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig 2012-01-05 13:44:23.579067307 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma.c 2012-01-05 13:44:43.324820451 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c +--- compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c.orig 2012-02-05 16:10:33.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/brcm80211/brcmsmac/dma.c 2012-02-06 11:53:01.622278256 -0500 @@ -14,6 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ @@ -53,9 +53,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/brcm80211/brcmsmac/dma. #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/slab.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c ---- compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c.orig 2012-01-05 13:41:22.852326703 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c 2012-01-05 13:41:31.209222227 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c +--- compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/3945-mac.c 2012-02-06 11:53:01.625278218 -0500 @@ -27,6 +27,7 @@ * *****************************************************************************/ @@ -64,9 +64,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/3945-mac.c.ori #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c ---- compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c.orig 2012-01-05 13:41:47.962012787 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c 2012-01-05 13:41:41.547092984 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c +--- compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/iwlegacy/4965-mac.c 2012-02-06 11:53:01.630278156 -0500 @@ -27,6 +27,7 @@ * *****************************************************************************/ @@ -75,9 +75,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/iwlegacy/4965-mac.c.ori #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c 2012-01-05 13:40:44.681803897 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c.orig 2012-02-05 16:10:35.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/cfg.c 2012-02-06 11:53:01.630278156 -0500 @@ -6,6 +6,7 @@ * */ @@ -86,9 +86,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/cfg.c.orig com #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/hardirq.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c 2012-01-05 13:40:44.682803885 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_cs.c 2012-02-06 11:53:01.631278143 -0500 @@ -21,6 +21,7 @@ */ @@ -97,9 +97,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_cs.c.orig c #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c.orig 2011-12-18 16:10:36.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c 2012-01-05 13:40:44.683803873 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_sdio.c 2012-02-06 11:53:01.631278143 -0500 @@ -26,6 +26,7 @@ * if_sdio_card_to_host() to pad the data. */ @@ -108,9 +108,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_sdio.c.orig #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c 2012-01-05 13:40:44.685803849 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_spi.c 2012-02-06 11:53:01.631278143 -0500 @@ -17,6 +17,7 @@ * (at your option) any later version. */ @@ -119,9 +119,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_spi.c.orig #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/hardirq.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c 2012-01-05 13:40:44.686803837 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c.orig 2012-02-05 16:10:35.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/if_usb.c 2012-02-06 11:53:01.632278130 -0500 @@ -2,6 +2,7 @@ * This file contains functions used in USB interface module. */ @@ -130,9 +130,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/if_usb.c.orig #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/delay.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c 2012-01-05 13:40:44.687803825 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/main.c 2012-02-06 11:53:01.632278130 -0500 @@ -4,6 +4,7 @@ * thread etc.. */ @@ -141,17 +141,17 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/main.c.orig co #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/mesh.c 2012-01-05 13:40:44.688803813 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/mesh.c 2012-02-06 11:53:01.633278118 -0500 @@ -1,3 +1,4 @@ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/delay.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c 2012-01-05 13:40:44.689803801 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c.orig 2012-02-05 16:10:35.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas/rx.c 2012-02-06 11:53:01.633278118 -0500 @@ -2,6 +2,7 @@ * This file contains the handling of RX in wlan driver. */ @@ -160,9 +160,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas/rx.c.orig comp #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/etherdevice.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c 2012-01-05 13:40:44.690803789 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c.orig 2012-02-05 16:10:36.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/cmd.c 2012-02-06 11:53:01.633278118 -0500 @@ -7,6 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. @@ -171,9 +171,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/cmd.c.orig #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/hardirq.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c 2012-01-05 13:40:44.691803776 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c.orig 2012-02-05 16:10:36.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/if_usb.c 2012-02-06 11:53:01.634278106 -0500 @@ -9,6 +9,7 @@ */ #define DRV_NAME "lbtf_usb" @@ -182,9 +182,9 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/if_usb.c.or #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include "libertas_tf.h" -diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c.orig compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c ---- compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c 2012-01-05 13:40:44.692803763 -0500 +diff -up compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c.orig compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c +--- compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/libertas_tf/main.c 2012-02-06 11:53:01.634278106 -0500 @@ -7,6 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. @@ -193,130 +193,31 @@ diff -up compat-wireless-2011-12-18/drivers/net/wireless/libertas_tf/main.c.orig #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/hardirq.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/base.c 2012-01-05 13:40:44.693803750 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/ip.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/cam.c 2012-01-05 13:40:44.694803737 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/export.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c 2012-01-05 13:40:44.694803737 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/firmware.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c 2012-01-05 13:40:44.695803725 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "../wifi.h" -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c 2012-01-05 13:40:44.695803725 -0500 -@@ -27,6 +27,7 @@ - * - ****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/module.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192de/sw.c 2012-01-05 13:40:44.695803725 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/vmalloc.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/hw.c 2012-01-05 13:40:44.696803713 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "../wifi.h" -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/phy.c 2012-01-05 13:40:44.696803713 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "../wifi.h" -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/rf.c 2012-01-05 13:40:44.697803701 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "../wifi.h" -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/rtl8192se/sw.c 2012-01-05 13:40:44.697803701 -0500 -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/vmalloc.h> -diff -up compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c.orig compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c ---- compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/drivers/net/wireless/rtlwifi/usb.c 2012-01-05 13:40:44.697803701 -0500 -@@ -25,6 +25,7 @@ - * - *****************************************************************************/ +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/base.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/base.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/cam.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/cam.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192de/sw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/hw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/hw.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/phy.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/phy.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/rf.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/rf.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/sw.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/usb.c.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/usb.c +diff -up compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h.orig compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h +--- compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h.orig 2012-02-06 11:53:38.798813484 -0500 ++++ compat-wireless-2012-02-05/drivers/net/wireless/rtlwifi/wifi.h 2012-02-06 11:53:47.489704835 -0500 +@@ -30,6 +30,7 @@ + #ifndef __RTL_WIFI_H__ + #define __RTL_WIFI_H__ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include <linux/usb.h> -diff -up compat-wireless-2011-12-18/net/wireless/core.c.orig compat-wireless-2011-12-18/net/wireless/core.c ---- compat-wireless-2011-12-18/net/wireless/core.c.orig 2011-12-18 16:10:35.000000000 -0500 -+++ compat-wireless-2011-12-18/net/wireless/core.c 2012-01-05 13:40:44.698803689 -0500 + #include <linux/sched.h> +diff -up compat-wireless-2012-02-05/net/wireless/core.c.orig compat-wireless-2012-02-05/net/wireless/core.c +--- compat-wireless-2012-02-05/net/wireless/core.c.orig 2012-02-05 16:10:38.000000000 -0500 ++++ compat-wireless-2012-02-05/net/wireless/core.c 2012-02-06 11:53:01.640278030 -0500 @@ -4,6 +4,7 @@ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> */ @@ -325,9 +226,9 @@ diff -up compat-wireless-2011-12-18/net/wireless/core.c.orig compat-wireless-201 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/if.h> -diff -up compat-wireless-2011-12-18/net/wireless/lib80211.c.orig compat-wireless-2011-12-18/net/wireless/lib80211.c ---- compat-wireless-2011-12-18/net/wireless/lib80211.c.orig 2011-12-18 16:10:34.000000000 -0500 -+++ compat-wireless-2011-12-18/net/wireless/lib80211.c 2012-01-05 13:40:44.698803689 -0500 +diff -up compat-wireless-2012-02-05/net/wireless/lib80211.c.orig compat-wireless-2012-02-05/net/wireless/lib80211.c +--- compat-wireless-2012-02-05/net/wireless/lib80211.c.orig 2012-02-05 16:10:31.000000000 -0500 ++++ compat-wireless-2012-02-05/net/wireless/lib80211.c 2012-02-06 11:53:01.640278030 -0500 @@ -13,6 +13,7 @@ * */ @@ -336,9 +237,9 @@ diff -up compat-wireless-2011-12-18/net/wireless/lib80211.c.orig compat-wireless #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> -diff -up compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c.orig compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c ---- compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c.orig 2011-12-18 16:10:34.000000000 -0500 -+++ compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c 2012-01-05 13:40:44.698803689 -0500 +diff -up compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c.orig compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c +--- compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c.orig 2012-02-05 16:10:31.000000000 -0500 ++++ compat-wireless-2012-02-05/net/wireless/lib80211_crypt_tkip.c 2012-02-06 11:53:01.641278018 -0500 @@ -10,6 +10,7 @@ * more details. */ @@ -347,10 +248,10 @@ diff -up compat-wireless-2011-12-18/net/wireless/lib80211_crypt_tkip.c.orig comp #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/err.h> -diff -up compat-wireless-2011-12-18/net/wireless/reg.c.orig compat-wireless-2011-12-18/net/wireless/reg.c ---- compat-wireless-2011-12-18/net/wireless/reg.c.orig 2011-12-18 16:10:34.000000000 -0500 -+++ compat-wireless-2011-12-18/net/wireless/reg.c 2012-01-05 13:40:44.699803676 -0500 -@@ -33,6 +33,7 @@ +diff -up compat-wireless-2012-02-05/net/wireless/reg.c.orig compat-wireless-2012-02-05/net/wireless/reg.c +--- compat-wireless-2012-02-05/net/wireless/reg.c.orig 2012-02-05 16:10:31.000000000 -0500 ++++ compat-wireless-2012-02-05/net/wireless/reg.c 2012-02-06 11:53:01.641278018 -0500 +@@ -42,6 +42,7 @@ * */ @@ -358,9 +259,9 @@ diff -up compat-wireless-2011-12-18/net/wireless/reg.c.orig compat-wireless-2011 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/kernel.h> -diff -up compat-wireless-2011-12-18/patches/98-pr_fmt.patch.orig compat-wireless-2011-12-18/patches/98-pr_fmt.patch ---- compat-wireless-2011-12-18/patches/98-pr_fmt.patch.orig 2012-01-05 13:39:36.552655633 -0500 -+++ compat-wireless-2011-12-18/patches/98-pr_fmt.patch 2012-01-05 13:39:36.553655620 -0500 +diff -up compat-wireless-2012-02-05/patches/98-pr_fmt.patch.orig compat-wireless-2012-02-05/patches/98-pr_fmt.patch +--- compat-wireless-2012-02-05/patches/98-pr_fmt.patch.orig 2012-02-06 11:53:01.641278018 -0500 ++++ compat-wireless-2012-02-05/patches/98-pr_fmt.patch 2012-02-06 11:53:01.641278018 -0500 @@ -0,0 +1,346 @@ +The way the compat-* header files are included causes the default +pr_fmt definition from <linux/kernel.h> to be evaluated for every file. diff --git a/compat-wireless-use-kconfig_h.patch b/compat-wireless-use-kconfig_h.patch deleted file mode 100644 index 55dfa38d8..000000000 --- a/compat-wireless-use-kconfig_h.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up compat-wireless-2012-01-24/include/linux/compat-2.6.h.orig compat-wireless-2012-01-24/include/linux/compat-2.6.h ---- compat-wireless-2012-01-24/include/linux/compat-2.6.h.orig 2012-01-26 11:05:25.687613527 -0500 -+++ compat-wireless-2012-01-24/include/linux/compat-2.6.h 2012-01-26 11:05:48.997322113 -0500 -@@ -2,7 +2,9 @@ - #define LINUX_26_COMPAT_H - - #include <linux/version.h> --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -+#include <linux/kconfig.h> -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) - #include <generated/autoconf.h> - #else - #include <linux/autoconf.h> diff --git a/kernel.spec b/kernel.spec index 410761daa..670f20dc8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -208,7 +208,7 @@ Summary: The Linux kernel %define kversion 3.%{base_sublevel} # The compat-wireless version -%define cwversion 2012-01-26 +%define cwversion 2012-02-05 ####################################################################### # If cwversion is less than kversion, make sure with_backports is @@ -747,11 +747,6 @@ Patch21093: rt2x00_fix_MCU_request_failures.patch Patch50000: compat-wireless-config-fixups.patch Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch Patch50002: compat-wireless-integrated-build.patch -Patch50003: compat-wireless-use-kconfig_h.patch -Patch50004: compat-move-br_port_exists-to-compat-2_6_36_h.patch -Patch50005: compat-wireless-fix-some-config-options.patch - -Patch50100: ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch %endif @@ -1504,11 +1499,7 @@ cd compat-wireless-%{cwversion} ApplyPatch compat-wireless-config-fixups.patch ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch ApplyPatch compat-wireless-integrated-build.patch -ApplyPatch compat-wireless-use-kconfig_h.patch -ApplyPatch compat-move-br_port_exists-to-compat-2_6_36_h.patch -ApplyPatch compat-wireless-fix-some-config-options.patch -ApplyPatch ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch ApplyPatch rt2x00_fix_MCU_request_failures.patch cd .. @@ -2286,6 +2277,9 @@ fi # ||----w | # || || %changelog +* Mon Feb 06 2012 John W. Linville <linville@redhat.com> +- Update compat-wireless snapshot from 2012-02-05 + * Fri Feb 03 2012 Josh Boyer <jwboyer@redhat.com> - Goodbye iSeries. Only sfr loved you and even he's moved on @@ -1,4 +1,4 @@ 364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz -ca5588cf0dab8e9f3441b6fc42fccdf0 compat-wireless-2012-01-26.tar.bz2 465f9cf994d5c94b15ba167fae8e60fb patch-3.3-rc2.xz 5a36e83118c2eb6ed433cab0f131ff0b patch-3.3-rc2-git3.xz +02c210a8fd24acca8c1ac93f6f1d3913 compat-wireless-2012-02-05.tar.bz2 |