rpms/kernel/devel git-wireless-dev.patch, 1.11, 1.12 kernel-2.6.spec, 1.3220, 1.3221 git-iwlwifi.patch, 1.11, NONE
John W. Linville (linville)
fedora-extras-commits at redhat.com
Wed Jun 13 19:52:32 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16504
Modified Files:
git-wireless-dev.patch kernel-2.6.spec
Removed Files:
git-iwlwifi.patch
Log Message:
update wireless-dev patch, drop iwlwifi patch (now in wireless-dev)
git-wireless-dev.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git-wireless-dev.patch 7 Jun 2007 16:38:07 -0000 1.11
+++ git-wireless-dev.patch 13 Jun 2007 19:51:46 -0000 1.12
@@ -1,20 +1,6 @@
-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
+--- linux-2.6.21.noarch/CREDITS.orig 2007-06-13 15:29:50.000000000 -0400
++++ linux-2.6.21.noarch/CREDITS 2007-06-13 15:32:28.000000000 -0400
+@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
S: (ask for current address)
S: USA
@@ -80,37226 +66,43693 @@
N: Lars Wirzenius
E: liw at iki.fi
D: Linux System Administrator's Guide, author, former maintainer
-diff --git a/MAINTAINERS b/MAINTAINERS
-index f3b5a39..6847fda 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -299,6 +299,14 @@ M: corentin.labbe at geomatys.fr
- L: lm-sensors at lm-sensors.org
- S: Maintained
-
-+ADM8211 WIRELESS DRIVER
-+P: Michael Wu
-+M: flamingice at sourmilk.net
-+L: linux-wireless at vger.kernel.org
-+W: http://aluminum.sourmilk.net/adm8211/
-+T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-+S: Maintained
-+
- ADT746X FAN DRIVER
- P: Colin Leroy
- M: colin at colino.net
-@@ -767,6 +775,15 @@ L: linux-hams at vger.kernel.org
- W: http://www.baycom.org/~tom/ham/ham.html
- S: Maintained
+--- linux-2.6.21.noarch/include/linux/nl80211.h.orig 2007-06-13 15:30:05.000000000 -0400
++++ linux-2.6.21.noarch/include/linux/nl80211.h 2007-06-13 15:32:28.000000000 -0400
+@@ -7,6 +7,217 @@
+ */
-+BCM43XX WIRELESS DRIVER (DEVICESCAPE BASED VERSION)
-+P: Michael Buesch
-+M: mb at bu3sch.de
-+P: Stefano Brivio
-+M: st3 at riseup.net
-+L: linux-wireless at vger.kernel.org
-+W: http://bcm43xx.berlios.de/
-+S: Maintained
+ /**
++ * 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,
++ NL80211_CMD_DEAUTH,
++ NL80211_CMD_GET_AUTH_LIST,
++ NL80211_CMD_NEW_AUTH_LIST,
++ NL80211_CMD_AUTHENTICATION_CHANGED,
++ NL80211_CMD_AP_SET_BEACON,
++ NL80211_CMD_AP_ADD_STA,
++ NL80211_CMD_AP_UPDATE_STA,
++ NL80211_CMD_AP_GET_STA_INFO,
++ NL80211_CMD_AP_SET_RATESETS,
++ NL80211_CMD_ADD_KEY,
++ NL80211_CMD_DEL_KEY,
+
- BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
- P: Larry Finger
- M: Larry.Finger at lwfinger.net
-@@ -919,6 +936,12 @@ M: zambrano at broadcom.com
- L: netdev at vger.kernel.org
- S: Supported
-
-+BROADCOM B44 - SONICS SILICON BACKPLANE (SSB) BITS
-+P: Michael Buesch
-+M: mb at bu3sch.de
-+L: netdev at vger.kernel.org
-+S: Maintained
++ /* add commands here */
+
- BROADCOM BNX2 GIGABIT ETHERNET DRIVER
- P: Michael Chan
- M: mchan at broadcom.com
-@@ -2906,6 +2929,15 @@ L: kpreempt-tech at lists.sourceforge.net
- W: ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
- S: Supported
-
-+P54 WIRELESS DRIVER
-+P: Michael Wu
-+M: flamingice at sourmilk.net
-+L: linux-wireless at vger.kernel.org
-+L: developers at islsm.org
-+W: http://prism54.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-+S: Maintained
++ /* used to define NL80211_CMD_MAX below */
++ __NL80211_CMD_AFTER_LAST
++};
++#define NL80211_CMD_MAX (__NL80211_CMD_AFTER_LAST - 1)
+
- PRISM54 WIRELESS DRIVER
- P: Luis R. Rodriguez
- M: mcgrof at gmail.com
-@@ -2986,6 +3018,13 @@ M: corey at world.std.com
- L: linux-wireless at vger.kernel.org
- S: Maintained
-
-+Ralink rt2x00 WLAN driver
-+P: rt2x00 project
-+L: linux-wireless at vger.kernel.org
-+L: rt2400-devel at lists.sourceforge.net
-+W: http://rt2x00.serialmonkey.com/
-+S: Maintained
[...163772 lines suppressed...]
+{
++ pcicore_write32(pc, 0x130, address);
++ pcicore_write32(pc, 0x134, data);
+}
-+#endif /* CONFIG_NL80211 */
+
-+#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)
++static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
++ u8 address, u16 data)
+{
-+ struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
-+ int res;
++ const u16 mdio_control = 0x128;
++ const u16 mdio_data = 0x12C;
++ u32 v;
++ int i;
+
-+ if (len > IFNAMSIZ)
-+ return -EINVAL;
++ v = 0x80; /* Enable Preamble Sequence */
++ v |= 0x2; /* MDIO Clock Divisor */
++ pcicore_write32(pc, mdio_control, v);
+
-+ if (!rdev->ops->add_virtual_intf)
-+ return -ENOSYS;
++ v = (1 << 30); /* Start of Transaction */
++ v |= (1 << 28); /* Write Transaction */
++ v |= (1 << 17); /* Turnaround */
++ v |= (u32)device << 22;
++ v |= (u32)address << 18;
++ v |= data;
++ pcicore_write32(pc, mdio_data, v);
++ udelay(10);
++ for (i = 0; i < 10; i++) {
++ v = pcicore_read32(pc, mdio_control);
++ if (v & 0x100 /* Trans complete */)
++ break;
++ msleep(1);
++ }
++ pcicore_write32(pc, mdio_control, 0);
++}
+
-+ rtnl_lock();
-+ res = rdev->ops->add_virtual_intf(&rdev->wiphy, (char*)buf,
-+ NL80211_IFTYPE_UNSPECIFIED);
-+ rtnl_unlock();
++static void ssb_broadcast_value(struct ssb_device *dev,
++ u32 address, u32 data)
++{
++ /* This is used for both, PCI and ChipCommon core, so be careful. */
++ BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
++ BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
+
-+ return res ? res : len;
++ ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
++ ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
++ ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
++ ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
+}
+
-+static ssize_t _store_remove_iface(struct device *dev,
-+ struct device_attribute *attr,
-+ const char *buf, size_t len)
++static void ssb_commit_settings(struct ssb_bus *bus)
+{
-+ struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
-+ int res, ifidx;
-+ struct net_device *netdev;
++ struct ssb_device *dev;
+
-+ if (len > IFNAMSIZ)
-+ return -EINVAL;
++ dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
++ assert(dev);
++ /* This forces an update of the cached registers. */
++ ssb_broadcast_value(dev, 0xFD8, 0);
++}
+
-+ if (!rdev->ops->del_virtual_intf)
-+ return -ENOSYS;
++int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
++ struct ssb_device *dev)
++{
++ struct ssb_device *pdev = pc->dev;
++ struct ssb_bus *bus;
++ int err = 0;
++ u32 tmp;
+
-+ netdev = dev_get_by_name(buf);
-+ if (!netdev)
-+ return -ENODEV;
-+ ifidx = netdev->ifindex;
-+ dev_put(netdev);
++ might_sleep();
+
-+ rtnl_lock();
-+ res = rdev->ops->del_virtual_intf(&rdev->wiphy, ifidx);
-+ rtnl_unlock();
++ if (!pdev)
++ goto out;
++ bus = pdev->bus;
+
-+ return res ? res : len;
-+}
++ /* Enable interrupts for this device. */
++ if (bus->host_pci &&
++ ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
++ u32 coremask;
+
- 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),
- {}
- };
-
++ /* Calculate the "coremask" for the device. */
++ coremask = (1 << dev->core_index);
++
++ err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
++ if (err)
++ goto out;
++ tmp |= coremask << 8;
++ err = pci_write_config_dword(bus->host_pci, SSB_PCI_IRQMASK, tmp);
++ if (err)
++ goto out;
++ } else {
++ u32 intvec;
++
++ intvec = ssb_read32(pdev, SSB_INTVEC);
++ tmp = ssb_read32(dev, SSB_TPSFLAG);
++ tmp &= SSB_TPSFLAG_BPFLAG;
++ intvec |= tmp;
++ ssb_write32(pdev, SSB_INTVEC, intvec);
++ }
++
++ /* Setup PCIcore operation. */
++ if (pc->setup_done)
++ goto out;
++ if (pdev->id.coreid == SSB_DEV_PCI) {
++ tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++ tmp |= SSB_PCICORE_SBTOPCI_PREF;
++ tmp |= SSB_PCICORE_SBTOPCI_BURST;
++ pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++
++ if (pdev->id.revision < 5) {
++ tmp = ssb_read32(pdev, SSB_IMCFGLO);
++ tmp &= ~SSB_IMCFGLO_SERTO;
++ tmp |= 2;
++ tmp &= ~SSB_IMCFGLO_REQTO;
++ tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
++ ssb_write32(pdev, SSB_IMCFGLO, tmp);
++ ssb_commit_settings(bus);
++ } else if (pdev->id.revision >= 11) {
++ tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
++ tmp |= SSB_PCICORE_SBTOPCI_MRM;
++ pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
++ }
++ } else {
++ assert(pdev->id.coreid == SSB_DEV_PCIE);
++ //TODO: Better make defines for all these magic PCIE values.
++ if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
++ /* TLP Workaround register. */
++ tmp = ssb_pcie_read(pc, 0x4);
++ tmp |= 0x8;
++ ssb_pcie_write(pc, 0x4, tmp);
++ }
++ if (pdev->id.revision == 0) {
++ const u8 serdes_rx_device = 0x1F;
++
++ ssb_pcie_mdio_write(pc, serdes_rx_device,
++ 2 /* Timer */, 0x8128);
++ ssb_pcie_mdio_write(pc, serdes_rx_device,
++ 6 /* CDR */, 0x0100);
++ ssb_pcie_mdio_write(pc, serdes_rx_device,
++ 7 /* CDR BW */, 0x1466);
++ } else if (pdev->id.revision == 1) {
++ /* DLLP Link Control register. */
++ tmp = ssb_pcie_read(pc, 0x100);
++ tmp |= 0x40;
++ ssb_pcie_write(pc, 0x100, tmp);
++ }
++ }
++ pc->setup_done = 1;
++out:
++ return err;
++}
++EXPORT_SYMBOL(ssb_pcicore_dev_irqvecs_enable);
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3220
retrieving revision 1.3221
diff -u -r1.3220 -r1.3221
--- kernel-2.6.spec 12 Jun 2007 20:59:50 -0000 1.3220
+++ kernel-2.6.spec 13 Jun 2007 19:51:49 -0000 1.3221
@@ -490,7 +490,6 @@
Patch660: linux-2.6-libata-ali-atapi-dma.patch
Patch670: linux-2.6-ata-quirk.patch
Patch680: git-wireless-dev.patch
-Patch690: git-iwlwifi.patch
Patch710: linux-2.6-bcm43xx-pci-neuter.patch
Patch780: linux-2.6-clockevents-fix-resume-logic.patch
Patch790: linux-2.6-acpi-dock-oops.patch
@@ -1112,8 +1111,6 @@
# Add the new wireless stack and drivers from wireless-dev
ApplyPatch git-wireless-dev.patch
-# Update the iwlwifi drivers from www.intellinuxwireless.org git tree
-ApplyPatch git-iwlwifi.patch
# avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
@@ -2087,6 +2084,10 @@
%endif
%changelog
+* Wed Jun 13 2007 John W. Linville <linville at redhat.com>
+- Refresh wireless-dev patch
+- Drop iwlwifi patch (0.0.25 now in wireless-dev!)
+
* Tue Jun 12 2007 Dave Jones <davej at redhat.com>
- Disable libusual.
--- git-iwlwifi.patch DELETED ---
More information about the fedora-extras-commits
mailing list