more .25 patches

diff --git a/queue-2.6.25/mac80211-send-association-event-on-ibss-create.patch b/queue-2.6.25/mac80211-send-association-event-on-ibss-create.patch
new file mode 100644 (file)
index 0000000..cf952e9
--- /dev/null
+++ b/queue-2.6.25/mac80211-send-association-event-on-ibss-create.patch
@@ -0,0 +1,40 @@
+From 507b06d0622480f8026d49a94f86068bb0fd6ed6 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 3 Jun 2008 23:39:55 -0400
+Subject: mac80211: send association event on IBSS create
+
+From: Dan Williams <dcbw@redhat.com>
+
+patch 507b06d0622480f8026d49a94f86068bb0fd6ed6 upstream
+
+Otherwise userspace has no idea the IBSS creation succeeded.
+
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/mac80211/ieee80211_sta.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/net/mac80211/ieee80211_sta.c
++++ b/net/mac80211/ieee80211_sta.c
+@@ -2723,6 +2723,7 @@ static int ieee80211_sta_join_ibss(struc
+       struct rate_selection ratesel;
+       u8 *pos;
+       struct ieee80211_sub_if_data *sdata;
++      union iwreq_data wrqu;
+ 
+       /* Remove possible STA entries from other IBSS networks. */
+       sta_info_flush(local, NULL);
+@@ -2863,6 +2864,10 @@ static int ieee80211_sta_join_ibss(struc
+ 
+       ieee80211_rx_bss_put(dev, bss);
+ 
++      memset(&wrqu, 0, sizeof(wrqu));
++      memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
++      wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
++
+       return res;
+ }
+ 

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index db2311052104461bbcdfb023f9cc187317f814b0..debd5a61a5d00c302bbb5c0362199f7cdaffa7a2 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -43,3 +43,5 @@ cpufreq-fix-format-string-bug.patch
 serial-fix-enable_irq_wake-disable_irq_wake-imbalance-in-serial_core.c.patch
 kconfig-introduce-arch_defconfig-to-defconfig_list.patch
 bttv-fix-a-deadlock-in-the-bttv-driver.patch
+x86-fix-recursive-dependencies.patch
+mac80211-send-association-event-on-ibss-create.patch

diff --git a/queue-2.6.25/x86-fix-recursive-dependencies.patch b/queue-2.6.25/x86-fix-recursive-dependencies.patch
new file mode 100644 (file)
index 0000000..858a955
--- /dev/null
+++ b/queue-2.6.25/x86-fix-recursive-dependencies.patch
@@ -0,0 +1,63 @@
+From 823c248e7cc75b4f22da914b01f8e5433cff197e Mon Sep 17 00:00:00 2001
+From: Roman Zippel <zippel@linux-m68k.org>
+Date: Fri, 29 Feb 2008 05:09:02 +0100
+Subject: [PATCH] x86: fix recursive dependencies
+Message-ID: <20080613065945.GB28810@elte.hu>
+
+From: Roman Zippel <zippel@linux-m68k.org>
+
+commit 823c248e7cc75b4f22da914b01f8e5433cff197e in mainline
+
+The proper dependency check uncovered a few dependency problems,
+the subarchitecture used a mixture of selects and depends on SMP
+and PCI dependency was messed up.
+
+Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
+
+---
+ arch/x86/Kconfig |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -246,8 +246,7 @@ config X86_ELAN
+ 
+ config X86_VOYAGER
+       bool "Voyager (NCR)"
+-      depends on X86_32
+-      select SMP if !BROKEN
++      depends on X86_32 && (SMP || BROKEN)
+       help
+         Voyager is an MCA-based 32-way capable SMP architecture proprietary
+         to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
+@@ -259,9 +258,8 @@ config X86_VOYAGER
+ 
+ config X86_NUMAQ
+       bool "NUMAQ (IBM/Sequent)"
+-      select SMP
++      depends on SMP && X86_32
+       select NUMA
+-      depends on X86_32
+       help
+         This option is used for getting Linux to run on a (IBM/Sequent) NUMA
+         multiquad box. This changes the way that processors are bootstrapped,
+@@ -332,7 +330,7 @@ config X86_RDC321X
+ 
+ config X86_VSMP
+       bool "Support for ScaleMP vSMP"
+-      depends on X86_64 && PCI
++      depends on X86_64
+        help
+         Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
+         supposed to run on these EM64T-based machines.  Only choose this option
+@@ -1384,7 +1382,7 @@ endmenu
+ menu "Bus options (PCI etc.)"
+ 
+ config PCI
+-      bool "PCI support" if !X86_VISWS
++      bool "PCI support" if !X86_VISWS && !X86_VSMP
+       depends on !X86_VOYAGER
+       default y
+       select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)