rpms/kernel/devel git-wireless-dev.patch, 1.33, 1.34 kernel.spec, 1.135, 1.136 linux-2.6-wireless-pending.patch, 1.2, 1.3 linux-2.6-mac80211-local-mcast-filter.patch, 1.3, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Thu Aug 30 20:27:37 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222
Modified Files:
git-wireless-dev.patch kernel.spec
linux-2.6-wireless-pending.patch
Removed Files:
linux-2.6-mac80211-local-mcast-filter.patch
Log Message:
Update bits from wireless-2.6 and wireless-dev
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.33 -r 1.34 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- git-wireless-dev.patch 24 Aug 2007 02:35:10 -0000 1.33
+++ git-wireless-dev.patch 30 Aug 2007 20:27:31 -0000 1.34
@@ -1,18610 +1,5676 @@
-diff -u linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-17 19:28:10.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-23 21:07:20.000000000 -0400
-@@ -25,35 +25,351 @@
- #include "ieee80211_rate.h"
- #include "wpa.h"
- #include "aes_ccm.h"
--#include "debugfs_key.h"
+--- linux-2.6.22.noarch/CREDITS.orig 2007-08-30 16:13:22.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS 2007-08-30 16:13:50.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
+ S: (ask for current address)
+ S: USA
--static void ieee80211_set_hw_encryption(struct net_device *dev,
-- struct sta_info *sta, u8 addr[ETH_ALEN],
-- struct ieee80211_key *key)
-+
-+static int ieee80211_ioctl_set_beacon(struct net_device *dev,
-+ struct prism2_hostapd_param *param,
-+ int param_len,
-+ int flag)
-+{
-+ struct ieee80211_sub_if_data *sdata;
-+ struct ieee80211_if_ap *ap;
-+ u8 **b_head, **b_tail;
-+ int *b_head_len, *b_tail_len;
-+ int len;
++N: Robin Cornelius
++E: robincornelius at users.sourceforge.net
++D: Ralink rt2x00 WLAN driver
++S: Cornwall, U.K.
+
-+ len = ((char *) param->u.beacon.data - (char *) param) +
-+ param->u.beacon.head_len + param->u.beacon.tail_len;
+ 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
+
-+ if (param_len > len)
-+ param_len = len;
-+ else if (param_len != len)
-+ return -EINVAL;
+ 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
+
-+ sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-+ if (sdata->type != IEEE80211_IF_TYPE_AP)
-+ return -EINVAL;
-+ ap = &sdata->u.ap;
+ N: John G Dorsey
+ E: john+ at cs.cmu.edu
+ D: ARM Linux ports to Assabet/Neponset, Spot
+@@ -3517,6 +3533,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
+
-+ switch (flag) {
-+ case 0:
-+ b_head = &ap->beacon_head;
-+ b_tail = &ap->beacon_tail;
-+ b_head_len = &ap->beacon_head_len;
-+ b_tail_len = &ap->beacon_tail_len;
-+ break;
-+ default:
-+ printk(KERN_DEBUG "%s: unknown beacon flag %d\n",
-+ dev->name, flag);
-+ return -EINVAL;
-+ }
+ N: Peter Shaobo Wang
+ E: pwang at mmdcorp.com
+ W: http://www.mmdcorp.com/pw/linux
+@@ -3651,6 +3673,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
+
-+ kfree(*b_head);
-+ kfree(*b_tail);
-+ *b_head = NULL;
-+ *b_tail = NULL;
+ N: Lars Wirzenius
+ 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-30 16:13:51.000000000 -0400
+@@ -7,6 +7,201 @@
+ */
+
+ /**
++ * enum nl80211_commands - supported nl80211 commands
++ * @NL80211_CMD_UNSPEC: unspecified command to catch errors
++ * @NL80211_CMD_RENAME_WIPHY: rename a wiphy, needs
++ * %NL80211_ATTR_WIPHY and %NL80211_ATTR_WIPHY_NAME
++ * @NL80211_CMD_WIPHY_NEWNAME: rename notification
++ * @NL80211_CMD_GET_CMDLIST: TO BE DEFINED PROPERLY. currently the code makes
++ * it depend on the wiphy only but it really should depend on the
++ * interface type too....
++ * @NL80211_CMD_NEW_CMDLIST: command list result
++ * @NL80211_CMD_ADD_VIRTUAL_INTERFACE: create a virtual interface for the
++ * wiphy identified by an %NL80211_ATTR_WIPHY attribute with the given
++ * %NL80211_ATTR_IFTYPE and %NL80211_ATTR_IFNAME.
++ * @NL80211_CMD_DEL_VIRTUAL_INTERFACE: destroy a virtual interface identified
++ * by %NL80211_ATTR_IFINDEX.
++ * @NL80211_CMD_CHANGE_VIRTUAL_INTERFACE: change type of virtual interface to
++ * the type given by %NL80211_ATTR_IFTYPE, the interface is identified by
++ * %NL80211_ATTR_IFINDEX.
++ * @NL80211_CMD_GET_WIPHYS: request a list of all wiphys present in the system
++ * @NL80211_CMD_NEW_WIPHYS: returned list of all wiphys
++ * @NL80211_CMD_GET_INTERFACES: request a list of all interfaces belonging to
++ * the wiphy identified by %NL80211_ATTR_WIPHY
++ * @NL80211_CMD_NEW_INTERFACES: result for %NL80211_CMD_GET_INTERFACES
++ * @NL80211_CMD_INITIATE_SCAN: initiate a scan with the passed parameters. THe
++ * parameters may contain %NL80211_ATTR_FLAG_SCAN_ACTIVE,
++ * %NL80211_ATTR_PHYMODE and a list of channels in an
++ * %NL80211_ATTR_CHANNEL_LIST attribute (an array of nested attributes)
++ * containing %NL80211_ATTR_CHANNEL, %NL80211_ATTR_PHYMODE, and possibly
++ * %NL80211_ATTR_FLAG_SCAN_ACTIVE. The outer %NL80211_ATTR_FLAG_SCAN_ACTIVE
++ * is ignored when a channel list is present.
++ * @NL80211_CMD_SCAN_RESULT: scan result, contains an array in
++ * %NL80211_ATTR_BSS_LIST.
++ * @NL80211_CMD_ASSOCIATE: associate with the given parameters
++ * (%NL80211_ATTR_SSID is mandatory, %NL80211_ATTR_TIMEOUT_TU,
++ * %NL80211_ATTR_BSSID, %NL80211_ATTR_CHANNEL, %NL80211_ATTR_PHYMODE,
++ * and %NL80211_ATTR_IE may be given)
++ * @NL80211_CMD_ADD_KEY: add a key with given %NL80211_ATTR_KEY_DATA,
++ * %NL80211_ATTR_KEY_ID, %NL80211_ATTR_KEY_TYPE, %NL80211_ATTR_MAC and
++ * %NL80211_ATTR_KEY_CIPHER attributes.
++ * @NL80211_CMD_DEL_KEY: delete a key identified by %NL80211_ATTR_KEY_ID,
++ * %NL80211_ATTR_KEY_TYPE and %NL80211_ATTR_MAC or all keys.
++ * @__NL80211_CMD_AFTER_LAST: internal use
++ */
++enum nl80211_commands {
++/* don't change the order or add anything inbetween, this is ABI! */
++ NL80211_CMD_UNSPEC,
++ /* %input: wiphy, wiphy_name */
++ NL80211_CMD_RENAME_WIPHY,
++ NL80211_CMD_WIPHY_NEWNAME,
++ /* %input: wiphy|ifindex */
++ NL80211_CMD_GET_CMDLIST,
++ NL80211_CMD_NEW_CMDLIST,
++ /* %input: wiphy, ifname, {iftype} */
++ NL80211_CMD_ADD_VIRTUAL_INTERFACE,
++ /* %input: wiphy, ifindex */
++ NL80211_CMD_DEL_VIRTUAL_INTERFACE,
++ /* %input: ifindex, iftype */
++ NL80211_CMD_CHANGE_VIRTUAL_INTERFACE,
++ /* %input: */
++ NL80211_CMD_GET_WIPHYS,
++ NL80211_CMD_NEW_WIPHYS,
++ /* %input: wiphy */
++ NL80211_CMD_GET_INTERFACES,
++ NL80211_CMD_NEW_INTERFACES,
++ NL80211_CMD_INITIATE_SCAN,
++ NL80211_CMD_SCAN_RESULT,
++ NL80211_CMD_GET_ASSOCIATION,
++ NL80211_CMD_ASSOCIATION_CHANGED,
++ NL80211_CMD_ASSOCIATE,
++ NL80211_CMD_DISASSOCIATE,
[...28431 lines suppressed...]
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/p54usb.h 2007-08-30 16:13:50.000000000 -0400
@@ -0,0 +1,133 @@
+#ifndef PRISM54USB_H
+#define PRISM54USB_H
@@ -135857,10 +122562,8 @@
+};
+
+#endif /* PRISM54USB_H */
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/iwl-helpers.h 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/iwl-helpers.h 2007-08-30 16:13:50.000000000 -0400
@@ -0,0 +1,255 @@
+/******************************************************************************
+ *
@@ -136117,10 +122820,8 @@
+}
+
+#endif /* __iwl_helpers_h__ */
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/iwl-3945-rs.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/iwl-3945-rs.c 2007-08-30 16:13:50.000000000 -0400
@@ -0,0 +1,985 @@
+/******************************************************************************
+ *
@@ -137107,10 +123808,8 @@
+}
+
+
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/b43_pci_bridge.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,46 @@
+/*
+ * Broadcom 43xx PCI-SSB bridge module
@@ -137158,10 +123857,8 @@
+{
+ ssb_pcihost_unregister(&b43_pci_bridge_driver);
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Makefile 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,18 @@
+# core
+ssb-y += main.o scan.o
@@ -137181,10 +123878,8 @@
+ssb-$(CONFIG_SSB_PCIHOST) += b43_pci_bridge.o
+
+obj-$(CONFIG_SSB) += ssb.o
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcmcia.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,271 @@
+/*
+ * Sonics Silicon Backplane
@@ -137457,10 +124152,8 @@
+error:
+ return -ENODEV;
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/main.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,1162 @@
+/*
+ * Sonics Silicon Backplane
@@ -138624,10 +125317,8 @@
+ bus_unregister(&ssb_bustype);
+}
+module_exit(ssb_modexit)
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pcihost_wrapper.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,104 @@
+/*
+ * Sonics Silicon Backplane
@@ -138733,10 +125424,8 @@
+ return pci_register_driver(driver);
+}
+EXPORT_SYMBOL(ssb_pcihost_register);
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_mipscore.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,223 @@
+/*
+ * Sonics Silicon Backplane
@@ -138961,10 +125650,8 @@
+ ssb_mips_serial_init(mcore);
+ ssb_mips_flash_detect(mcore);
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/ssb_private.h 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef LINUX_SSB_PRIVATE_H_
+#define LINUX_SSB_PRIVATE_H_
@@ -139102,10 +125789,8 @@
+#endif /* CONFIG_SSB_PCIHOST */
+
+#endif /* LINUX_SSB_PRIVATE_H_ */
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/pci.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,740 @@
+/*
+ * Sonics Silicon Backplane PCI-Hostbus related functions.
@@ -139847,10 +126532,8 @@
+out:
+ return err;
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_chipcommon.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,446 @@
+/*
+ * Sonics Silicon Backplane
@@ -140298,10 +126981,8 @@
+ return nr_ports;
+}
+#endif /* CONFIG_SSB_SERIAL */
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,117 @@
+menu "Sonics Silicon Backplane"
+
@@ -140420,10 +127101,8 @@
+ If unsure, say N
+
+endmenu
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,413 @@
+/*
+ * Sonics Silicon Backplane
@@ -140838,10 +127517,8 @@
+ ssb_iounmap(bus);
+ goto out;
+}
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_extif.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,129 @@
+/*
+ * Sonics Silicon Backplane
@@ -140972,10 +127649,8 @@
+ mask, value);
+}
+
-only in patch2:
-unchanged:
---- /dev/null 2007-08-23 19:26:52.541589664 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-23 21:07:20.000000000 -0400
+--- /dev/null 2007-08-30 08:15:33.553140766 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c 2007-08-30 16:13:51.000000000 -0400
@@ -0,0 +1,576 @@
+/*
+ * Sonics Silicon Backplane
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kernel.spec 30 Aug 2007 02:20:32 -0000 1.135
+++ kernel.spec 30 Aug 2007 20:27:32 -0000 1.136
@@ -627,8 +627,7 @@
#Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
Patch690: git-wireless-dev.patch
-Patch691: linux-2.6-mac80211-local-mcast-filter.patch
-Patch692: linux-2.6-iwlwifi-fw-name-compat.patch
+Patch691: linux-2.6-iwlwifi-fw-name-compat.patch
Patch700: linux-2.6-bcm43xx-pci-neuter.patch
Patch710: linux-2.6-netdev-e1000e-01.patch
Patch711: linux-2.6-netdev-e1000e-02.patch
@@ -1124,8 +1123,6 @@
ApplyPatch linux-2.6-wireless-pending.patch
# Add the wireless stack updates and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
-# mac80211: Filter locally-originated multicast frames echoed by AP
-ApplyPatch linux-2.6-mac80211-local-mcast-filter.patch
# temp compat patch for iwlwifi firmware filenames
ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
@@ -1782,6 +1779,9 @@
%changelog
+* Thu Aug 30 2007 John W. Linville <linville at redhat.com>
+- Update bits from wireless-2.6 and wireless-dev
+
* Wed Aug 29 2007 Roland McGrath <roland at redhat.com>
- Add ppc64 back to vdso_arches.
linux-2.6-wireless-pending.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-wireless-pending.patch
Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-wireless-pending.patch 18 Aug 2007 00:38:16 -0000 1.2
+++ linux-2.6-wireless-pending.patch 30 Aug 2007 20:27:32 -0000 1.3
@@ -1,37 +1,13054 @@
---- linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c.orig 2007-08-17 19:24:38.000000000 -0400
-+++ linux-2.6.22.noarch/net/mac80211/ieee80211_ioctl.c 2007-08-17 19:28:10.000000000 -0400
-@@ -798,6 +798,20 @@ static int ieee80211_ioctl_giwrate(struc
+--- linux-2.6.22.noarch/include/net/mac80211.h.orig 2007-08-30 15:51:43.000000000 -0400
++++ linux-2.6.22.noarch/include/net/mac80211.h 2007-08-30 16:06:06.000000000 -0400
+@@ -1,7 +1,9 @@
+ /*
+- * Low-level hardware driver -- IEEE 802.11 driver (80211.o) interface
++ * mac80211 <-> driver interface
++ *
+ * Copyright 2002-2005, Devicescape Software, Inc.
+ * Copyright 2006-2007 Jiri Benc <jbenc at suse.cz>
++ * Copyright 2007 Johannes Berg <johannes at sipsolutions.net>
+ *
+ * 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
+@@ -192,13 +194,19 @@ 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
+- * hw->set_key() */
++ s8 key_idx; /* HW_KEY_IDX_INVALID = do not encrypt,
++ * other values: keyidx from hw->set_key() */
+ u8 icv_len; /* length of the ICV/MIC field in octets */
+ u8 iv_len; /* length of the IV field in octets */
+ u8 tkip_key[16]; /* generated phase2/phase1 key for hw TKIP */
+@@ -288,28 +296,10 @@ struct ieee80211_conf {
+ u8 power_level; /* transmit power limit for current
+ * regulatory domain; in dBm */
+ u8 antenna_max; /* maximum antenna gain */
+- short tx_power_reduction; /* in 0.1 dBm */
+
+ /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
+ u8 antenna_sel_tx;
+ u8 antenna_sel_rx;
+-
+- int antenna_def;
+- int antenna_mode;
+-
+- /* Following five fields are used for IEEE 802.11H */
+- unsigned int radar_detect;
+- unsigned int spect_mgmt;
+- /* All following fields are currently unused. */
+- unsigned int quiet_duration; /* duration of quiet period */
+- unsigned int quiet_offset; /* how far into the beacon is the quiet
+- * period */
+- unsigned int quiet_period;
+- u8 radar_firpwr_threshold;
+- u8 radar_rssi_threshold;
+- u8 pulse_height_threshold;
+- u8 pulse_rssi_threshold;
+- u8 pulse_inband_threshold;
+ };
+
+ /**
+@@ -402,29 +392,41 @@ struct ieee80211_if_conf {
+ struct ieee80211_tx_control *beacon_control;
+ };
+
+-typedef enum { ALG_NONE, ALG_WEP, ALG_TKIP, ALG_CCMP, ALG_NULL }
+-ieee80211_key_alg;
++typedef enum {
++ ALG_NONE,
++ ALG_WEP,
++ ALG_TKIP,
++ ALG_CCMP,
++} ieee80211_key_alg;
+
++/*
++ * This flag indiciates that the station this key is being
++ * configured for may use QoS. If your hardware cannot handle
++ * that situation it should reject that key.
++ */
++#define IEEE80211_KEY_FLAG_WMM_STA (1<<0)
+
+ struct ieee80211_key_conf {
++ /*
++ * To be set by the driver to the key index it would like to
++ * get in the ieee80211_tx_control.key_idx which defaults
++ * to HW_KEY_IDX_INVALID so that shouldn't be used.
++ */
++ int hw_key_idx;
+
+- int hw_key_idx; /* filled + used by low-level driver */
++ /* key algorithm, ALG_NONE should never be seen by the driver */
+ ieee80211_key_alg alg;
+- int keylen;
+
+-#define IEEE80211_KEY_FORCE_SW_ENCRYPT (1<<0) /* to be cleared by low-level
+- driver */
+-#define IEEE80211_KEY_DEFAULT_TX_KEY (1<<1) /* This key is the new default TX
+- key (used only for broadcast
+- keys). */
+-#define IEEE80211_KEY_DEFAULT_WEP_ONLY (1<<2) /* static WEP is the only
+- configured security policy;
+- this allows some low-level
+- drivers to determine when
+- hwaccel can be used */
+- u32 flags; /* key configuration flags defined above */
++ /* key flags, see above */
++ u8 flags;
++
++ /* key index: 0-3 */
++ s8 keyidx;
++
++ /* length of key material */
++ u8 keylen;
+
+- s8 keyidx; /* WEP key index */
++ /* the key material */
+ u8 key[0];
+ };
+
+@@ -432,7 +434,7 @@ struct ieee80211_key_conf {
+ #define IEEE80211_SEQ_COUNTER_TX 1
+
+ typedef enum {
+- SET_KEY, DISABLE_KEY, REMOVE_ALL_KEYS,
++ SET_KEY, DISABLE_KEY,
+ } set_key_cmd;
+
+ /* This is driver-visible part of the per-hw state the stack keeps. */
+@@ -457,20 +459,25 @@ struct ieee80211_hw {
+
+ /* TODO: frame_type 802.11/802.3, sw_encryption requirements */
+
+- /* Some wireless LAN chipsets generate beacons in the hardware/firmware
+- * and others rely on host generated beacons. This option is used to
+- * configure the upper layer IEEE 802.11 module to generate beacons.
+- * The low-level driver can use ieee80211_beacon_get() to fetch the
+- * next beacon frame. */
+-#define IEEE80211_HW_HOST_GEN_BEACON (1<<0)
++/* hole at 0 */
+
+- /* The device needs to be supplied with a beacon template only. */
++ /*
++ * The device only needs to be supplied with a beacon template.
++ * If you need the host to generate each beacon then don't use
++ * this flag and use ieee80211_beacon_get().
++ */
+ #define IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE (1<<1)
+
+- /* Some devices handle decryption internally and do not
++ /*
++ * Some devices handle decryption internally and do not
+ * indicate whether the frame was encrypted (unencrypted frames
+ * will be dropped by the hardware, unless specifically allowed
+- * through) */
++ * through.)
++ * It is permissible to not handle all encrypted frames and fall
++ * back to software encryption; however, if this flag is set
++ * unencrypted frames must be dropped unless the driver is told
++ * otherwise via the set_ieee8021x() callback.
++ */
+ #define IEEE80211_HW_DEVICE_HIDES_WEP (1<<2)
+
+ /* Whether RX frames passed to ieee80211_rx() include FCS in the end */
+@@ -484,19 +491,30 @@ struct ieee80211_hw {
+ * can fetch them with ieee80211_get_buffered_bc(). */
+ #define IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING (1<<4)
+
++ /*
++ * This flag is only relevant if hardware encryption is used.
++ * If set, it has two meanings:
++ * 1) the IV and ICV are present in received frames that have
++ * been decrypted (unless IEEE80211_HW_DEVICE_HIDES_WEP is
++ * also set)
++ * 2) on transmission, the IV should be generated in software.
++ *
++ * Please let us know if you *don't* use this flag, the stack would
++ * really like to be able to get the IV to keep key statistics
++ * accurate.
++ */
+ #define IEEE80211_HW_WEP_INCLUDE_IV (1<<5)
+
+- /* will data nullfunc frames get proper TX status callback */
+-#define IEEE80211_HW_DATA_NULLFUNC_ACK (1<<6)
++/* hole at 6 */
[...16580 lines suppressed...]
+- (char *)kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
++ adapter->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
+ if (!adapter->prdeeprom)
+ return -ENOMEM;
+ memcpy(adapter->prdeeprom, ®ctrl, sizeof(regctrl));
+@@ -72,9 +71,9 @@ static int libertas_ethtool_get_eeprom(s
regctrl.action, regctrl.offset, regctrl.NOB);
ret = libertas_prepare_and_send_command(priv,
@@ -11700,7 +25730,7 @@
®ctrl);
if (ret) {
-@@ -138,8 +138,8 @@ static int libertas_ethtool_get_stats_co
+@@ -138,8 +137,8 @@ static int libertas_ethtool_get_stats_co
/* Get Mesh Statistics */
ret = libertas_prepare_and_send_command(priv,
@@ -11712,7 +25742,7 @@
if (ret) {
ret = 0;
--- linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-08-17 19:28:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/libertas/decl.h 2007-08-30 16:06:06.000000000 -0400
@@ -15,14 +15,9 @@ struct wlan_private;
struct sk_buff;
struct net_device;
@@ -11748,7 +25778,7 @@
void __libertas_cleanup_and_insert_cmd(wlan_private * priv,
struct cmd_ctrl_node *ptempcmd);
-@@ -75,17 +68,14 @@ void libertas_mac_event_disconnected(wla
+@@ -75,17 +68,15 @@ void libertas_mac_event_disconnected(wla
void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str);
@@ -11760,16 +25790,27 @@
int *cfp_no);
wlan_private *libertas_add_card(void *card, struct device *dmdev);
-int libertas_activate_card(wlan_private *priv, char *fw_name);
-+int libertas_activate_card(wlan_private *priv);
int libertas_remove_card(wlan_private *priv);
++int libertas_start_card(wlan_private *priv);
++int libertas_stop_card(wlan_private *priv);
int libertas_add_mesh(wlan_private *priv, struct device *dev);
void libertas_remove_mesh(wlan_private *priv);
-
+int libertas_reset_device(wlan_private *priv);
#endif /* _WLAN_DECL_H_ */
---- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-08-17 19:24:36.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-08-17 19:28:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/rtl8187.h 2007-08-30 16:06:06.000000000 -0400
+@@ -67,6 +67,7 @@ struct rtl8187_priv {
+ struct rtl818x_csr *map;
+ void (*rf_init)(struct ieee80211_hw *);
+ int mode;
++ int if_id;
+
+ /* rtl8187 specific */
+ struct ieee80211_channel channels[14];
+--- linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/isl_ioctl.c 2007-08-30 16:06:06.000000000 -0400
@@ -1753,7 +1753,7 @@ prism54_get_oid(struct net_device *ndev,
int rvalue;
enum oid_num_t n = dwrq->flags;
@@ -11798,7 +25839,7 @@
void
--- linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-08-17 19:28:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/prism54/oid_mgt.c 2007-08-30 16:06:06.000000000 -0400
@@ -244,13 +244,11 @@ mgt_init(islpci_private *priv)
/* Alloc the cache */
for (i = 0; i < OID_NUM_LAST; i++) {
@@ -11814,8 +25855,8 @@
} else
priv->mib[i] = NULL;
}
---- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-08-17 19:24:36.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-17 19:28:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/Kconfig.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/Kconfig 2007-08-30 16:06:05.000000000 -0400
@@ -63,11 +63,6 @@ config WAVELAN
a Radio LAN (wireless Ethernet-like Local Area Network) using the
radio frequencies 900 MHz and 2.4 GHz.
@@ -11950,8 +25991,8 @@
config PCMCIA_WL3501
tristate "Planet WL3501 PCMCIA cards"
depends on EXPERIMENTAL && PCMCIA && WLAN_80211
---- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-08-17 19:24:36.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-08-17 19:28:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/wl3501_cs.c 2007-08-30 16:06:06.000000000 -0400
@@ -859,7 +859,7 @@ static int wl3501_esbq_confirm(struct wl
static void wl3501_online(struct net_device *dev)
@@ -12203,7 +26244,15 @@
int rc = wl3501_get_mib_value(this,
WL3501_MIB_ATTR_PRIV_OPT_IMPLEMENTED,
&implemented, sizeof(implemented));
-@@ -1852,7 +1852,7 @@ static int wl3501_get_power(struct net_d
+@@ -1841,7 +1841,6 @@ static int wl3501_get_encode(struct net_
+ tocopy = min_t(u8, len_keys, wrqu->encoding.length);
+ tocopy = min_t(u8, tocopy, 100);
+ wrqu->encoding.length = tocopy;
+- memset(extra, 0, tocopy);
+ memcpy(extra, keys, tocopy);
+ out:
+ return rc;
+@@ -1852,7 +1851,7 @@ static int wl3501_get_power(struct net_d
union iwreq_data *wrqu, char *extra)
{
u8 pwr_state;
@@ -12212,7 +26261,7 @@
int rc = wl3501_get_mib_value(this,
WL3501_MIB_ATTR_CURRENT_PWR_STATE,
&pwr_state, sizeof(pwr_state));
-@@ -1937,7 +1937,7 @@ static int wl3501_probe(struct pcmcia_de
+@@ -1937,7 +1936,7 @@ static int wl3501_probe(struct pcmcia_de
dev->tx_timeout = wl3501_tx_timeout;
dev->watchdog_timeo = 5 * HZ;
dev->get_stats = wl3501_get_stats;
@@ -12221,7 +26270,7 @@
this->wireless_data.spy_data = &this->spy_data;
this->p_dev = p_dev;
dev->wireless_data = &this->wireless_data;
-@@ -2006,7 +2006,7 @@ static int wl3501_config(struct pcmcia_d
+@@ -2006,7 +2005,7 @@ static int wl3501_config(struct pcmcia_d
SET_MODULE_OWNER(dev);
@@ -12230,7 +26279,7 @@
/*
* At this point, the dev_node_t structure(s) should be initialized and
* arranged in a linked list at link->dev_node.
-@@ -2079,7 +2079,7 @@ static int wl3501_suspend(struct pcmcia_
+@@ -2079,7 +2078,7 @@ static int wl3501_suspend(struct pcmcia_
{
struct net_device *dev = link->priv;
@@ -12239,7 +26288,7 @@
if (link->open)
netif_device_detach(dev);
-@@ -2090,7 +2090,7 @@ static int wl3501_resume(struct pcmcia_d
+@@ -2090,7 +2089,7 @@ static int wl3501_resume(struct pcmcia_d
{
struct net_device *dev = link->priv;
@@ -12249,7 +26298,7 @@
wl3501_reset(dev);
netif_device_attach(dev);
--- linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-08-17 19:28:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/arlan-proc.c 2007-08-30 16:06:05.000000000 -0400
@@ -435,7 +435,7 @@ static int arlan_sysctl_info(ctl_table *
goto final;
}
@@ -12314,7 +26363,7 @@
} else
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-08-17 19:28:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_wlan.h 2007-08-30 16:06:05.000000000 -0400
@@ -3,6 +3,7 @@
#include <linux/wireless.h>
@@ -12332,8 +26381,8 @@
u16 infofid; /* MAC buffer id for info frame */
/* txfid, intransmitfid, next_txtid, and next_alloc are protected by
* txfidlock */
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-08-17 19:24:36.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-08-17 19:28:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_cs.c 2007-08-30 16:06:05.000000000 -0400
@@ -272,7 +272,7 @@ static int sandisk_enable_wireless(struc
{
int res, ret = 0;
@@ -12344,7 +26393,7 @@
tuple_t tuple;
cisparse_t *parse = NULL;
--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c.orig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-08-17 19:28:01.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_hw.c 2007-08-30 16:06:05.000000000 -0400
@@ -825,7 +825,7 @@ static int hfa384x_get_rid(struct net_de
local->hw_downloading)
return -ENODEV;
@@ -12414,8 +26463,8 @@
local = iface->local;
/* Send disconnect event, e.g., to trigger reassociation after resume
---- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-08-17 19:24:36.000000000 -0400
-+++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-08-17 19:28:01.000000000 -0400
+--- linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c.orig 2007-08-30 15:51:39.000000000 -0400
++++ linux-2.6.22.noarch/drivers/net/wireless/hostap/hostap_ioctl.c 2007-08-30 16:06:05.000000000 -0400
@@ -3088,7 +3088,7 @@ static int prism2_ioctl_priv_download(lo
static int prism2_set_genericelement(struct net_device *dev, u8 *elem,
size_t len)
--- linux-2.6-mac80211-local-mcast-filter.patch DELETED ---
More information about the fedora-extras-commits
mailing list