rpms/kernel/F-7 linux-2.6-b43-module-alias.patch, NONE, 1.1 git-wireless-dev.patch, 1.21, 1.22 kernel-2.6.spec, 1.3314, 1.3315 linux-2.6-mac80211-local-mcast-filter.patch, 1.2, 1.3 linux-2.6-mac80211-probe-hidden-essid.patch, 1.1, 1.2
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue Aug 14 19:01:43 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7713
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
linux-2.6-mac80211-local-mcast-filter.patch
linux-2.6-mac80211-probe-hidden-essid.patch
Added Files:
linux-2.6-b43-module-alias.patch
Log Message:
Update wireless-dev bits (mac80211 & ssb updates, bcm43xx -> b43 rename)
linux-2.6-b43-module-alias.patch:
--- NEW FILE linux-2.6-b43-module-alias.patch ---
--- linux-2.6.22.noarch/drivers/net/wireless/b43/main.c.orig 2007-08-14 14:42:00.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/b43/main.c 2007-08-14 14:41:24.000000000 -0400
@@ -57,6 +57,7 @@ MODULE_AUTHOR("Martin Langer");
MODULE_AUTHOR("Stefano Brivio");
MODULE_AUTHOR("Michael Buesch");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("bcm43xx-mac80211");
extern char *nvram_get(char *name);
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.21 -r 1.22 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/git-wireless-dev.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- git-wireless-dev.patch 8 Aug 2007 20:59:43 -0000 1.21
+++ git-wireless-dev.patch 14 Aug 2007 19:00:59 -0000 1.22
@@ -1,5 +1,5 @@
--- linux-2.6.22.noarch/CREDITS.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS 2007-08-08 16:44:13.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-08-14 14:06:59.000000000 -0400
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -67,7 +67,7 @@
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
--- linux-2.6.22.noarch/include/linux/nl80211.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-08-08 16:44:13.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h 2007-08-14 14:06:59.000000000 -0400
@@ -7,6 +7,201 @@
*/
@@ -327,8 +327,8 @@
+#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
+
#endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-08-08 16:43:47.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig 2007-08-14 13:55:29.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h 2007-08-14 14:06:59.000000000 -0400
@@ -106,6 +106,75 @@ struct ieee80211_hdr {
} __attribute__ ((packed));
@@ -627,8 +627,8 @@
+};
+
#endif /* IEEE80211_H */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,390 @@
+#ifndef LINUX_SSB_CHIPCO_H_
+#define LINUX_SSB_CHIPCO_H_
@@ -1020,8 +1020,8 @@
+#endif /* CONFIG_SSB_SERIAL */
+
+#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,198 @@
+/*
+ * Hardware-specific External Interface I/O core definitions
@@ -1221,8 +1221,8 @@
+
+#endif /* CONFIG_SSB_DRIVER_EXTIF */
+#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,46 @@
+#ifndef LINUX_SSB_MIPSCORE_H_
+#define LINUX_SSB_MIPSCORE_H_
@@ -1270,8 +1270,8 @@
+#endif /* CONFIG_SSB_DRIVER_MIPS */
+
+#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,292 @@
+#ifndef LINUX_SSB_REGS_H_
+#define LINUX_SSB_REGS_H_
@@ -1565,8 +1565,8 @@
+
+
+#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,106 @@
+#ifndef LINUX_SSB_PCICORE_H_
+#define LINUX_SSB_PCICORE_H_
@@ -1674,8 +1674,8 @@
+
+#endif /* CONFIG_SSB_DRIVER_PCICORE */
+#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ssb/ssb.h.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,432 @@
+#ifndef LINUX_SSB_H_
+#define LINUX_SSB_H_
@@ -2109,8 +2109,8 @@
+
+
+#endif /* LINUX_SSB_H_ */
---- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-08-08 16:43:47.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-08-08 16:44:13.000000000 -0400
+--- linux-2.6.22.noarch/include/net/cfg80211.h.orig 2007-08-14 13:55:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/cfg80211.h 2007-08-14 14:06:59.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/netlink.h>
@@ -2253,9 +2253,26 @@
+ u32 seq, int flags, u8 cmd);
+
#endif /* __NET_CFG80211_H */
---- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-08 16:43:47.000000000 -0400
-+++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-08 16:44:13.000000000 -0400
-@@ -300,7 +300,6 @@ struct ieee80211_conf {
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-14 13:55:29.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-14 14:09:01.000000000 -0400
+@@ -192,9 +192,15 @@ struct ieee80211_tx_control {
+ #define IEEE80211_TXCTL_FIRST_FRAGMENT (1<<8) /* this is a first fragment of
+ * the frame */
+ #define IEEE80211_TXCTL_TKIP_NEW_PHASE1_KEY (1<<9)
++#define IEEE80211_TXCTL_LONG_RETRY_LIMIT (1<<10) /* this frame should be send
++ * using the through
++ * set_retry_limit configured
++ * long retry value */
+ u32 flags; /* tx control flags defined
+ * above */
+- u8 retry_limit; /* 1 = only first attempt, 2 = one retry, .. */
++ u8 retry_limit; /* 1 = only first attempt, 2 = one retry, ..
++ * This could be used when set_retry_limit
++ * is not implemented by the driver */
+ u8 power_level; /* per-packet transmit power level, in dBm */
+ u8 antenna_sel_tx; /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
+ s8 key_idx; /* -1 = do not encrypt, >= 0 keyidx from
+@@ -300,7 +306,6 @@ struct ieee80211_conf {
/* Following five fields are used for IEEE 802.11H */
unsigned int radar_detect;
unsigned int spect_mgmt;
@@ -2263,7 +2280,7 @@
unsigned int quiet_duration; /* duration of quiet period */
unsigned int quiet_offset; /* how far into the beacon is the quiet
* period */
-@@ -521,6 +520,9 @@ struct ieee80211_hw {
+@@ -521,6 +526,9 @@ struct ieee80211_hw {
* per-packet RC4 key with each TX frame when doing hwcrypto */
#define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
@@ -2273,7 +2290,7 @@
u32 flags; /* hardware flags defined above */
/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -626,8 +628,7 @@ struct ieee80211_ops {
+@@ -626,8 +634,7 @@ struct ieee80211_ops {
* station hwaddr for individual keys. aid of the station is given
* to help low-level driver in selecting which key->hw_key_idx to use
* for this key. TX control data will use the hw_key_idx selected by
@@ -2283,7 +2300,7 @@
int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd,
u8 *addr, struct ieee80211_key_conf *key, int aid);
-@@ -649,8 +650,7 @@ struct ieee80211_ops {
+@@ -649,8 +656,7 @@ struct ieee80211_ops {
* used if the wlan hardware or low-level driver implements PAE.
* 80211.o module will anyway filter frames based on authorization
* state, so this function pointer can be NULL if low-level driver does
@@ -2293,7 +2310,7 @@
int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
int authorized);
-@@ -692,6 +692,14 @@ struct ieee80211_ops {
+@@ -692,6 +698,14 @@ struct ieee80211_ops {
void (*sta_table_notification)(struct ieee80211_hw *hw,
int num_sta);
@@ -2308,7 +2325,7 @@
/* Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
* bursting) for a hardware TX queue.
* queue = IEEE80211_TX_QUEUE_*.
-@@ -702,8 +710,9 @@ struct ieee80211_ops {
+@@ -702,8 +716,9 @@ struct ieee80211_ops {
/* Get statistics of the current TX queue status. This is used to get
* number of currently queued packets (queue length), maximum queue
* size (limit), and total number of packets sent using each TX queue
@@ -2320,7 +2337,7 @@
int (*get_tx_stats)(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats);
-@@ -719,6 +728,22 @@ struct ieee80211_ops {
+@@ -719,6 +734,22 @@ struct ieee80211_ops {
* TSF synchronization. */
void (*reset_tsf)(struct ieee80211_hw *hw);
@@ -2343,7 +2360,7 @@
/* Setup beacon data for IBSS beacons. Unlike access point (Master),
* IBSS uses a fixed beacon frame which is configured using this
* function. This handler is required only for IBSS mode. */
[...128779 lines suppressed...]
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-08 16:44:14.000000000 -0400
-@@ -0,0 +1,704 @@
+--- linux-2.6.22.noarch/drivers/ssb/pci.c.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-14 14:09:01.000000000 -0400
+@@ -0,0 +1,710 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
+ *
@@ -90193,6 +98737,10 @@
+#include "ssb_private.h"
+
+
++/* Define the following to 1 to enable a printk on each coreswitch. */
++#define SSB_VERBOSE_PCICORESWITCH_DEBUG 0
++
++
+/* Lowlevel coreswitching */
+int ssb_pci_switch_coreidx(struct ssb_bus *bus, u8 coreidx)
+{
@@ -90231,10 +98779,12 @@
+ int err;
+ unsigned long flags;
+
-+ ssb_dprintk(KERN_INFO PFX
-+ "Switching to %s core, index %d\n",
-+ ssb_core_name(dev->id.coreid),
-+ dev->core_index);
++#if SSB_VERBOSE_PCICORESWITCH_DEBUG
++ ssb_printk(KERN_INFO PFX
++ "Switching to %s core, index %d\n",
++ ssb_core_name(dev->id.coreid),
++ dev->core_index);
++#endif
+
+ spin_lock_irqsave(&bus->bar_lock, flags);
+ err = ssb_pci_switch_coreidx(bus, dev->core_index);
@@ -90872,9 +99422,9 @@
+out:
+ return err;
+}
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-08 16:44:14.000000000 -0400
-@@ -0,0 +1,425 @@
+--- linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-14 14:09:01.000000000 -0400
+@@ -0,0 +1,423 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom ChipCommon core driver
@@ -91252,10 +99802,8 @@
+ } else if (cc->dev->id.revision >= 3) {
+ /* Internal backplane clock */
+ baud_base = ssb_clockspeed(bus);
-+ div = 2; /* Minimum divisor */
-+ chipco_write32(cc, SSB_CHIPCO_CLKDIV,
-+ (chipco_read32(cc, SSB_CHIPCO_CLKDIV)
-+ & ~SSB_CHIPCO_CLKDIV_UART) | div);
++ div = chipco_read32(cc, SSB_CHIPCO_CLKDIV)
++ & SSB_CHIPCO_CLKDIV_UART;
+ } else {
+ /* Fixed internal backplane clock */
+ baud_base = 88000000;
@@ -91300,14 +99848,14 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-08 16:44:14.000000000 -0400
+--- linux-2.6.22.noarch/drivers/ssb/Kconfig.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-14 14:09:01.000000000 -0400
@@ -0,0 +1,92 @@
+menu "Sonics Silicon Backplane"
+
+config SSB
+ tristate "Sonics Silicon Backplane support"
-+ depends on EXPERIMENTAL && HAS_IOMEM
++ depends on HAS_IOMEM
+ help
+ Support for the Sonics Silicon Backplane bus
+
@@ -91326,8 +99874,8 @@
+ If unsure, say Y
+
+config SSB_PCMCIAHOST
-+ bool "Support for SSB on PCMCIA-bus host"
-+ depends on SSB && PCMCIA
++ bool "Support for SSB on PCMCIA-bus host (EXPERIMENTAL)"
++ depends on SSB && PCMCIA && EXPERIMENTAL
+ help
+ Support for a Sonics Silicon Backplane on top
+ of a PCMCIA device.
@@ -91370,14 +99918,14 @@
+ If unsure, say Y
+
+config SSB_PCICORE_HOSTMODE
-+ bool "Hostmode support for SSB PCI core"
-+ depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS
++ bool "Hostmode support for SSB PCI core (EXPERIMENTAL)"
++ depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && EXPERIMENTAL
+ help
+ PCIcore hostmode operation (external PCI bus).
+
+config SSB_DRIVER_MIPS
-+ bool "SSB Broadcom MIPS core driver"
-+ depends on SSB && MIPS
++ bool "SSB Broadcom MIPS core driver (EXPERIMENTAL)"
++ depends on SSB && MIPS && EXPERIMENTAL
+ select SSB_SERIAL
+ help
+ Driver for the Sonics Silicon Backplane attached
@@ -91386,8 +99934,8 @@
+ If unsure, say N
+
+config SSB_DRIVER_EXTIF
-+ bool "SSB Broadcom EXTIF core driver"
-+ depends on SSB_DRIVER_MIPS
++ bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
++ depends on SSB_DRIVER_MIPS && EXPERIMENTAL
+ help
+ Driver for the Sonics Silicon Backplane attached
+ Broadcom EXTIF core.
@@ -91395,8 +99943,8 @@
+ If unsure, say N
+
+endmenu
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-08 16:44:14.000000000 -0400
+--- linux-2.6.22.noarch/drivers/ssb/scan.c.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -91811,8 +100359,8 @@
+ ssb_iounmap(bus);
+ goto out;
+}
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-08 16:44:14.000000000 -0400
+--- linux-2.6.22.noarch/drivers/ssb/driver_extif.c.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-14 14:06:59.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -91918,9 +100466,9 @@
+ *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
+}
+
---- /dev/null 2007-08-08 08:21:33.519325700 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-08 16:44:14.000000000 -0400
-@@ -0,0 +1,568 @@
+--- linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c.orig 2007-08-14 14:06:59.000000000 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-14 14:09:01.000000000 -0400
+@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom PCI-core driver
@@ -92022,10 +100570,13 @@
+
+ /* Enable PCI bridge BAR1 prefetch and burst */
+ pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
++
++ /* Make sure our latency is high enough to handle the devices behind us */
++ pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8);
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
+
-+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
++int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+ return ssb_mips_irq(extpci_core->dev) + 2;
+}
@@ -92153,7 +100704,7 @@
+ val = *((const u32 *)buf);
+ break;
+ }
-+ writel(*((const u32 *)buf), mmio);
++ writel(val, mmio);
+
+ err = 0;
+unmap:
@@ -92234,6 +100785,8 @@
+ udelay(150); /* Assertion time demanded by the PCI standard */
+ val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
+ pcicore_write32(pc, SSB_PCICORE_CTL, val);
++ val = SSB_PCICORE_ARBCTL_INTERN;
++ pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);
+ udelay(1); /* Assertion time demanded by the PCI standard */
+
+ /*TODO cardbus mode */
@@ -92263,6 +100816,9 @@
+ * The following needs change, if we want to port hostmode
+ * to non-MIPS platform. */
+ set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
++ /* Give some time to the PCI controller to configure itself with the new
++ * values. Not waiting at this point causes crashes of the machine. */
++ mdelay(10);
+ register_pci_controller(&ssb_pcicore_controller);
+}
+
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3314
retrieving revision 1.3315
diff -u -r1.3314 -r1.3315
--- kernel-2.6.spec 14 Aug 2007 18:42:26 -0000 1.3314
+++ kernel-2.6.spec 14 Aug 2007 19:01:00 -0000 1.3315
@@ -1300,6 +1300,8 @@
ApplyPatch linux-2.6-rt2x00-usb-1_1-timeout.patch
# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
+# add module alias for "bcm43xx-mac80211"
+ApplyPatch linux-2.6-b43-module-alias.patch
# add patch from markmc so that e1000 supports ICH9
ApplyPatch linux-2.6-e1000-ich9.patch
@@ -2274,6 +2276,9 @@
%endif
%changelog
+* Tue Aug 14 2007 John W. Linville <linville at redhat.com>
+- Update wireless-dev bits (mac80211 & ssb updates, bcm43xx -> b43 rename)
+
* Tue Aug 14 2007 Chuck Ebbert <cebbert at redhat.com>
- update CFS scheduler with upstream patches
linux-2.6-mac80211-local-mcast-filter.patch:
Index: linux-2.6-mac80211-local-mcast-filter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-mac80211-local-mcast-filter.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-mac80211-local-mcast-filter.patch 7 Aug 2007 00:16:26 -0000 1.2
+++ linux-2.6-mac80211-local-mcast-filter.patch 14 Aug 2007 19:01:00 -0000 1.3
@@ -11,14 +11,12 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
- net/mac80211/ieee80211.c | 5 +++--
+ net/mac80211/rx.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
-index a42e70e..0097b0a 100644
---- a/net/mac80211/ieee80211.c
-+++ b/net/mac80211/ieee80211.c
-@@ -3030,9 +3030,10 @@ ieee80211_rx_h_data(struct ieee80211_txrx_data *rx)
+--- linux-2.6.22.noarch/net/mac80211/rx.c.orig 2007-08-14 11:43:23.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/rx.c 2007-08-14 11:43:19.000000000 -0400
+@@ -1088,9 +1088,10 @@ ieee80211_rx_h_data(struct ieee80211_txr
memcpy(dst, hdr->addr1, ETH_ALEN);
memcpy(src, hdr->addr3, ETH_ALEN);
linux-2.6-mac80211-probe-hidden-essid.patch:
Index: linux-2.6-mac80211-probe-hidden-essid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-mac80211-probe-hidden-essid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-mac80211-probe-hidden-essid.patch 7 Aug 2007 18:05:08 -0000 1.1
+++ linux-2.6-mac80211-probe-hidden-essid.patch 14 Aug 2007 19:01:00 -0000 1.2
@@ -5,22 +5,21 @@
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
- net/mac80211/ieee80211_sta.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ net/mac80211/ieee80211_sta.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
-index 007dd08..9f467cc 100644
---- a/net/mac80211/ieee80211_sta.c
-+++ b/net/mac80211/ieee80211_sta.c
-@@ -3217,7 +3217,10 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
+--- linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c.orig 2007-08-14 11:40:38.000000000 -0400
++++ linux-2.6.22.noarch/net/mac80211/ieee80211_sta.c 2007-08-14 11:47:06.000000000 -0400
+@@ -3129,7 +3129,11 @@ static int ieee80211_sta_config_auth(str
return 0;
} else {
if (ifsta->state != IEEE80211_AUTHENTICATE) {
- ieee80211_sta_start_scan(dev, NULL, 0);
-+ ieee80211_sta_start_scan(dev, ifsta->auto_ssid_sel ?
-+ NULL : ifsta->ssid,
-+ ifsta->auto_ssid_sel ?
-+ 0 : ifsta->ssid_len);
++ if (ifsta->auto_ssid_sel)
++ ieee80211_sta_start_scan(dev, NULL, 0);
++ else
++ ieee80211_sta_start_scan(dev, ifsta->ssid,
++ ifsta->ssid_len);
ifsta->state = IEEE80211_AUTHENTICATE;
set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
} else
More information about the fedora-extras-commits
mailing list