rpms/kernel/devel git-wireless-dev.patch, 1.10, 1.11 kernel-2.6.spec, 1.3211, 1.3212 git-iwlwifi.patch, 1.9, NONE linux-2.6-bcm43xx-mac80211-fixes.patch, 1.1, NONE linux-2.6-iwlwifi-irq_tasklet.patch, 1.1, NONE linux-2.6-iwlwifi-preferred_rate_control.patch, 1.1, NONE linux-2.6-iwlwifi-sw-scan-default.patch, 1.1, NONE linux-2.6-mac80211-fixes.patch, 1.1, NONE linux-2.6-mac80211-scan-optimizations.patch, 1.1, NONE linux-2.6-wireless.patch, 1.1, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Jun 7 16:38:50 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23230
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
Removed Files:
git-iwlwifi.patch linux-2.6-bcm43xx-mac80211-fixes.patch
linux-2.6-iwlwifi-irq_tasklet.patch
linux-2.6-iwlwifi-preferred_rate_control.patch
linux-2.6-iwlwifi-sw-scan-default.patch
linux-2.6-mac80211-fixes.patch
linux-2.6-mac80211-scan-optimizations.patch
linux-2.6-wireless.patch
Log Message:
restore git-wireless-dev.patch
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- git-wireless-dev.patch 4 May 2007 01:34:39 -0000 1.10
+++ git-wireless-dev.patch 7 Jun 2007 16:38:07 -0000 1.11
@@ -1,18415 +1,18610 @@
-git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git/
-
-commit 580a2521f318461a9bf07004e77c34d750cb3285
-
---- /dev/null 2007-04-17 21:17:54.747954992 -0400
-+++ linux-2.6.21.noarch/include/net/mac80211.h 2007-05-03 16:26:43.000000000 -0400
-@@ -0,0 +1,1060 @@
-+/*
-+ * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
-+ * Copyright 2002-2005, Devicescape Software, Inc.
-+ * Copyright 2006-2007 Jiri Benc <jbenc at suse.cz>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
+diff --git a/.mailmap b/.mailmap
+index ebf9bf8..83dcb40 100644
+--- a/.mailmap
++++ b/.mailmap
+@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
+ Jeff Garzik <jgarzik at pretzel.yyz.us>
+ Jens Axboe <axboe at suse.de>
+ Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
++Johannes Berg <johannes at sipsolutions.net>
+ John Stultz <johnstul at us.ibm.com>
+ Juha Yrjola <at solidboot.com>
+ Juha Yrjola <juha.yrjola at nokia.com>
+diff --git a/CREDITS b/CREDITS
+index 273d72b..7743b60 100644
+--- a/CREDITS
++++ b/CREDITS
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /proc/pid/maps protection
+ S: (ask for current address)
+ S: USA
+
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
+
-+#ifndef MAC80211_H
-+#define MAC80211_H
+ N: Mark Corner
+ E: mcorner at umich.edu
+ W: http://www.eecs.umich.edu/~mcorner/
+@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
+ S: Santa Cruz, California
+ S: USA
+
++N: Luis Correia
++E: lfcorreia at users.sf.net
++D: Ralink rt2x00 WLAN driver
++S: Belas, Portugal
+
-+#include <linux/kernel.h>
-+#include <linux/if_ether.h>
-+#include <linux/skbuff.h>
-+#include <linux/wireless.h>
-+#include <linux/device.h>
-+#include <linux/ieee80211.h>
-+#include <net/wireless.h>
-+#include <net/cfg80211.h>
+ N: Alan Cox
+ W: http://www.linux.org.uk/diary/
+ D: Linux Networking (0.99.10->2.0.29)
+@@ -833,6 +843,12 @@ S: Lancs
+ S: PR4 6AX
+ S: United Kingdom
+
++N: Ivo van Doorn
++E: IvDoorn at gmail.com
++W: http://www.mendiosus.nl
++D: Ralink rt2x00 WLAN driver
++S: Haarlem, The Netherlands
+
-+/* Note! Only ieee80211_tx_status_irqsafe() and ieee80211_rx_irqsafe() can be
-+ * called in hardware interrupt context. The low-level driver must not call any
-+ * other functions in hardware interrupt context. If there is a need for such
-+ * call, the low-level driver should first ACK the interrupt and perform the
-+ * IEEE 802.11 code call after this, e.g., from a scheduled tasklet (in
-+ * software interrupt context).
-+ */
-+
-+/*
-+ * Frame format used when passing frame between low-level hardware drivers
-+ * and IEEE 802.11 driver the same as used in the wireless media, i.e.,
-+ * buffers start with IEEE 802.11 header and include the same octets that
-+ * are sent over air.
-+ *
-+ * If hardware uses IEEE 802.3 headers (and perform 802.3 <-> 802.11
-+ * conversion in firmware), upper layer 802.11 code needs to be changed to
-+ * support this.
-+ *
-+ * If the receive frame format is not the same as the real frame sent
-+ * on the wireless media (e.g., due to padding etc.), upper layer 802.11 code
-+ * could be updated to provide support for such format assuming this would
-+ * optimize the performance, e.g., by removing need to re-allocation and
-+ * copying of the data.
-+ */
-+
-+#define IEEE80211_CHAN_W_SCAN 0x00000001
-+#define IEEE80211_CHAN_W_ACTIVE_SCAN 0x00000002
-+#define IEEE80211_CHAN_W_IBSS 0x00000004
-+
-+/* Channel information structure. Low-level driver is expected to fill in chan,
-+ * freq, and val fields. Other fields will be filled in by 80211.o based on
-+ * hostapd information and low-level driver does not need to use them. The
-+ * limits for each channel will be provided in 'struct ieee80211_conf' when
-+ * configuring the low-level driver with hw->config callback. If a device has
-+ * a default regulatory domain, IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED
-+ * can be set to let the driver configure all fields */
-+struct ieee80211_channel {
-+ short chan; /* channel number (IEEE 802.11) */
-+ short freq; /* frequency in MHz */
-+ int val; /* hw specific value for the channel */
-+ int flag; /* flag for hostapd use (IEEE80211_CHAN_*) */
-+ unsigned char power_level;
-+ unsigned char antenna_max;
-+};
-+
-+#define IEEE80211_RATE_ERP 0x00000001
-+#define IEEE80211_RATE_BASIC 0x00000002
-+#define IEEE80211_RATE_PREAMBLE2 0x00000004
-+#define IEEE80211_RATE_SUPPORTED 0x00000010
-+#define IEEE80211_RATE_OFDM 0x00000020
-+#define IEEE80211_RATE_CCK 0x00000040
-+#define IEEE80211_RATE_TURBO 0x00000080
-+#define IEEE80211_RATE_MANDATORY 0x00000100
-+
-+#define IEEE80211_RATE_CCK_2 (IEEE80211_RATE_CCK | IEEE80211_RATE_PREAMBLE2)
-+#define IEEE80211_RATE_MODULATION(f) \
-+ (f & (IEEE80211_RATE_CCK | IEEE80211_RATE_OFDM))
-+
-+/* Low-level driver should set PREAMBLE2, OFDM, CCK, and TURBO flags.
-+ * BASIC, SUPPORTED, ERP, and MANDATORY flags are set in 80211.o based on the
-+ * configuration. */
-+struct ieee80211_rate {
-+ int rate; /* rate in 100 kbps */
-+ int val; /* hw specific value for the rate */
-+ int flags; /* IEEE80211_RATE_ flags */
-+ int val2; /* hw specific value for the rate when using short preamble
-+ * (only when IEEE80211_RATE_PREAMBLE2 flag is set, i.e., for
-+ * 2, 5.5, and 11 Mbps) */
-+ signed char min_rssi_ack;
-+ unsigned char min_rssi_ack_delta;
-+
-+ /* following fields are set by 80211.o and need not be filled by the
-+ * low-level driver */
-+ int rate_inv; /* inverse of the rate (LCM(all rates) / rate) for
-+ * optimizing channel utilization estimates */
-+};
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3524,6 +3540,12 @@ S: Maastrichterweg 63
+ S: 5554 GG Valkenswaard
+ S: The Netherlands
+
++N: Mark Wallis
++E: mwallis at serialmonkey.com
++W: http://mark.serialmonkey.com
++D: Ralink rt2x00 WLAN driver
++S: Newcastle, Australia
+
-+/* 802.11g is backwards-compatible with 802.11b, so a wlan card can
-+ * actually be both in 11b and 11g modes at the same time. */
-+enum {
-+ MODE_IEEE80211A, /* IEEE 802.11a */
-+ MODE_IEEE80211B, /* IEEE 802.11b only */
-+ MODE_ATHEROS_TURBO, /* Atheros Turbo mode (2x.11a at 5 GHz) */
-+ MODE_IEEE80211G, /* IEEE 802.11g (and 802.11b compatibility) */
-+ MODE_ATHEROS_TURBOG, /* Atheros Turbo mode (2x.11g at 2.4 GHz) */
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3658,6 +3680,15 @@ S: Alte Regensburger Str. 11a
+ S: 93149 Nittenau
+ S: Germany
+
++N: Gertjan van Wingerde
++E: gwingerde at home.nl
++D: Ralink rt2x00 WLAN driver
++D: Minix V2 file-system
++D: Misc fixes
++S: Geessinkweg 177
++S: 7544 TX Enschede
++S: The Netherlands
+
-+ /* keep last */
-+ NUM_IEEE80211_MODES
[...151441 lines suppressed...]
++ if (err)
++ goto err_out;
+ }
-+ memcpy(ifsta->extra_ie, ie, len);
-+ ifsta->extra_ie_len = len;
+ return 0;
++ err_out:
++ genl_unregister_family(&nl80211_fam);
++ return err;
+}
+
-+
-+struct sta_info * ieee80211_ibss_add_sta(struct net_device *dev,
-+ struct sk_buff *skb, u8 *bssid,
-+ u8 *addr)
++void nl80211_exit(void)
+{
-+ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-+ struct sta_info *sta;
-+ struct ieee80211_sub_if_data *sdata = NULL;
-+
-+ /* TODO: Could consider removing the least recently used entry and
-+ * allow new one to be added. */
-+ if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-+ if (net_ratelimit()) {
-+ printk(KERN_DEBUG "%s: No room for a new IBSS STA "
-+ "entry " MAC_FMT "\n", dev->name, MAC_ARG(addr));
-+ }
-+ return NULL;
-+ }
-+
-+ printk(KERN_DEBUG "%s: Adding new IBSS station " MAC_FMT " (dev=%s)\n",
-+ local->mdev->name, MAC_ARG(addr), dev->name);
-+
-+ sta = sta_info_add(local, dev, addr, GFP_ATOMIC);
-+ if (!sta)
-+ return NULL;
-+
-+ sta->supp_rates = sdata->u.sta.supp_rates_bits;
-+
-+ rate_control_rate_init(sta, local);
-+
-+ return sta; /* caller will call sta_info_put() */
++ genl_unregister_family(&nl80211_fam);
+}
+diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
+new file mode 100644
+index 0000000..f3ea5c0
+--- /dev/null
++++ b/net/wireless/nl80211.h
+@@ -0,0 +1,24 @@
++#ifndef __NET_WIRELESS_NL80211_H
++#define __NET_WIRELESS_NL80211_H
+
++#include "core.h"
+
-+int ieee80211_sta_deauthenticate(struct net_device *dev, u16 reason)
++#ifdef CONFIG_NL80211
++extern int nl80211_init(void);
++extern void nl80211_exit(void);
++extern void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
++#else
++static inline int nl80211_init(void)
+{
-+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++ return 0;
++}
++static inline void nl80211_exit(void)
++{
++}
++static inline void nl80211_notify_dev_rename(
++ struct cfg80211_registered_device *rdev)
++{
++}
++#endif /* CONFIG_NL80211 */
+
-+ printk(KERN_DEBUG "%s: deauthenticate(reason=%d)\n",
-+ dev->name, reason);
++#endif /* __NET_WIRELESS_NL80211_H */
+diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
+index 3ebae14..7844be4 100644
+--- a/net/wireless/sysfs.c
++++ b/net/wireless/sysfs.c
+@@ -39,9 +39,59 @@ static ssize_t _show_permaddr(struct device *dev,
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ }
+
++static ssize_t _store_add_iface(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf, size_t len)
++{
++ struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
++ int res;
+
-+ if (sdata->type != IEEE80211_IF_TYPE_STA &&
-+ sdata->type != IEEE80211_IF_TYPE_IBSS)
++ if (len > IFNAMSIZ)
+ return -EINVAL;
+
-+ ieee80211_send_deauth(dev, ifsta, reason);
-+ ieee80211_set_disassoc(dev, ifsta, 1);
-+ return 0;
-+}
++ if (!rdev->ops->add_virtual_intf)
++ return -ENOSYS;
+
++ rtnl_lock();
++ res = rdev->ops->add_virtual_intf(&rdev->wiphy, (char*)buf,
++ NL80211_IFTYPE_UNSPECIFIED);
++ rtnl_unlock();
+
-+int ieee80211_sta_disassociate(struct net_device *dev, u16 reason)
-+{
-+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ struct ieee80211_if_sta *ifsta = &sdata->u.sta;
++ return res ? res : len;
++}
+
-+ printk(KERN_DEBUG "%s: disassociate(reason=%d)\n",
-+ dev->name, reason);
++static ssize_t _store_remove_iface(struct device *dev,
++ struct device_attribute *attr,
++ const char *buf, size_t len)
++{
++ struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
++ int res, ifidx;
++ struct net_device *netdev;
+
-+ if (sdata->type != IEEE80211_IF_TYPE_STA)
++ if (len > IFNAMSIZ)
+ return -EINVAL;
+
-+ if (!ifsta->associated)
-+ return -1;
++ if (!rdev->ops->del_virtual_intf)
++ return -ENOSYS;
+
-+ ieee80211_send_disassoc(dev, ifsta, reason);
-+ ieee80211_set_disassoc(dev, ifsta, 0);
-+ return 0;
-+}
---- /dev/null 2007-04-17 21:17:54.747954992 -0400
-+++ linux-2.6.21.noarch/net/mac80211/ieee80211_cfg.h 2007-05-03 16:26:44.000000000 -0400
-@@ -0,0 +1,9 @@
-+/*
-+ * mac80211 configuration hooks for cfg80211
-+ */
-+#ifndef __IEEE80211_CFG_H
-+#define __IEEE80211_CFG_H
++ netdev = dev_get_by_name(buf);
++ if (!netdev)
++ return -ENODEV;
++ ifidx = netdev->ifindex;
++ dev_put(netdev);
+
-+extern struct cfg80211_ops mac80211_config_ops;
++ rtnl_lock();
++ res = rdev->ops->del_virtual_intf(&rdev->wiphy, ifidx);
++ rtnl_unlock();
+
-+#endif /* __IEEE80211_CFG_H */
---- /dev/null 2007-04-17 21:17:54.747954992 -0400
-+++ linux-2.6.21.noarch/net/mac80211/debugfs.h 2007-05-03 16:26:44.000000000 -0400
-@@ -0,0 +1,16 @@
-+#ifndef __MAC80211_DEBUGFS_H
-+#define __MAC80211_DEBUGFS_H
-+
-+#ifdef CONFIG_MAC80211_DEBUGFS
-+extern void debugfs_hw_add(struct ieee80211_local *local);
-+extern void debugfs_hw_del(struct ieee80211_local *local);
-+extern int mac80211_open_file_generic(struct inode *inode, struct file *file);
-+#else
-+static inline void debugfs_hw_add(struct ieee80211_local *local)
-+{
-+ return;
++ return res ? res : len;
+}
-+static inline void debugfs_hw_del(struct ieee80211_local *local) {}
-+#endif
+
-+#endif /* __MAC80211_DEBUGFS_H */
---- linux-2.6.21.noarch/.mailmap.orig 2007-05-03 16:26:17.000000000 -0400
-+++ linux-2.6.21.noarch/.mailmap 2007-05-03 16:26:44.000000000 -0400
-@@ -57,6 +57,7 @@ Jean Tourrilhes <jt at hpl.hp.com>
- Jeff Garzik <jgarzik at pretzel.yyz.us>
- Jens Axboe <axboe at suse.de>
- Jens Osterkamp <Jens.Osterkamp at de.ibm.com>
-+Johannes Berg <johannes at sipsolutions.net>
- John Stultz <johnstul at us.ibm.com>
- Juha Yrjola <at solidboot.com>
- Juha Yrjola <juha.yrjola at nokia.com>
+ static struct device_attribute ieee80211_dev_attrs[] = {
+ __ATTR(index, S_IRUGO, _show_index, NULL),
+ __ATTR(macaddress, S_IRUGO, _show_permaddr, NULL),
++ __ATTR(add_iface, S_IWUGO, NULL, _store_add_iface),
++ __ATTR(remove_iface, S_IWUGO, NULL, _store_remove_iface),
+ {}
+ };
+
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3211
retrieving revision 1.3212
diff -u -r1.3211 -r1.3212
--- kernel-2.6.spec 6 Jun 2007 22:34:14 -0000 1.3211
+++ kernel-2.6.spec 7 Jun 2007 16:38:09 -0000 1.3212
@@ -443,16 +443,8 @@
Patch650: linux-2.6-sata-promise-pata-ports.patch
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch670: linux-2.6-ata-quirk.patch
-Patch680: linux-2.6-wireless.patch
Patch690: git-wireless-dev.patch
-Patch700: git-iwlwifi.patch
Patch710: linux-2.6-bcm43xx-pci-neuter.patch
-Patch720: linux-2.6-iwlwifi-preferred_rate_control.patch
-Patch730: linux-2.6-iwlwifi-irq_tasklet.patch
-Patch740: linux-2.6-mac80211-fixes.patch
-Patch750: linux-2.6-iwlwifi-sw-scan-default.patch
-Patch760: linux-2.6-mac80211-scan-optimizations.patch
-Patch770: linux-2.6-bcm43xx-mac80211-fixes.patch
Patch780: linux-2.6-clockevents-fix-resume-logic.patch
Patch790: linux-2.6-acpi-dock-oops.patch
Patch800: linux-2.6-wakeups-hdaps.patch
@@ -1055,26 +1047,10 @@
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
-# Add critical wireless updates from 2.6.22
-#ApplyPatch linux-2.6-wireless.patch
# Add the new wireless stack and drivers from wireless-dev
-#ApplyPatch git-wireless-dev.patch
-# ...and the iwlwifi driver from Intel
-#ApplyPatch git-iwlwifi.patch
+ApplyPatch git-wireless-dev.patch
# avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
#ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
-# let iwl3945 specify its preferred rate control algorithm
-#ApplyPatch linux-2.6-iwlwifi-preferred_rate_control.patch
-# kill iwl3945 irq_tasklet at module remove
-#ApplyPatch linux-2.6-iwlwifi-irq_tasklet.patch
-# some mac80211 bug fixes (defrag mem leak, reassoc failure handling)
-#ApplyPatch linux-2.6-mac80211-fixes.patch
-# iwl3945: default to sw scan
-#ApplyPatch linux-2.6-iwlwifi-sw-scan-default.patch
-# mac80211: improve scan performance
-#ApplyPatch linux-2.6-mac80211-scan-optimizations.patch
-# bcm43xx-mac80211: important phy and ssb bus fixes
-#ApplyPatch linux-2.6-bcm43xx-mac80211-fixes.patch
# Assorted dyntick/clock/timer fixes.
ApplyPatch linux-2.6-clockevents-fix-resume-logic.patch
@@ -2045,6 +2021,9 @@
%endif
%changelog
+* Thu Jun 07 2007 John W. Linville <linville at redhat.com>
+- Refresh wireless-dev patch to work w/ 2.6.22 base.
+
* Wed Jun 06 2007 Dave Jones <davej at redhat.com>
- RTC driver needs to be built-in.
--- git-iwlwifi.patch DELETED ---
--- linux-2.6-bcm43xx-mac80211-fixes.patch DELETED ---
--- linux-2.6-iwlwifi-irq_tasklet.patch DELETED ---
--- linux-2.6-iwlwifi-preferred_rate_control.patch DELETED ---
--- linux-2.6-iwlwifi-sw-scan-default.patch DELETED ---
--- linux-2.6-mac80211-fixes.patch DELETED ---
--- linux-2.6-mac80211-scan-optimizations.patch DELETED ---
--- linux-2.6-wireless.patch DELETED ---
More information about the fedora-extras-commits
mailing list