diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-07-21 07:36:53 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-07-21 07:36:53 +0000 |
commit | 3e4287a1e32ec08488ba2ef8ba61168f494ff8c5 (patch) | |
tree | 3ba68793a276b5f313ea613d6f1b7934193556e8 /net-wireless/ipw3945 | |
parent | Remove masked for removal package (diff) | |
download | gentoo-2-3e4287a1e32ec08488ba2ef8ba61168f494ff8c5.tar.gz gentoo-2-3e4287a1e32ec08488ba2ef8ba61168f494ff8c5.tar.bz2 gentoo-2-3e4287a1e32ec08488ba2ef8ba61168f494ff8c5.zip |
Remove masked for removal package
Diffstat (limited to 'net-wireless/ipw3945')
-rw-r--r-- | net-wireless/ipw3945/ChangeLog | 207 | ||||
-rw-r--r-- | net-wireless/ipw3945/Manifest | 17 | ||||
-rw-r--r-- | net-wireless/ipw3945/files/ipw3945-1.2.2-build.patch | 56 | ||||
-rw-r--r-- | net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch | 21 | ||||
-rw-r--r-- | net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.27.patch | 165 | ||||
-rw-r--r-- | net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild | 106 | ||||
-rw-r--r-- | net-wireless/ipw3945/metadata.xml | 8 |
7 files changed, 0 insertions, 580 deletions
diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog deleted file mode 100644 index 003c5bb08074..000000000000 --- a/net-wireless/ipw3945/ChangeLog +++ /dev/null @@ -1,207 +0,0 @@ -# ChangeLog for net-wireless/ipw3945 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.44 2013/06/01 11:21:55 pacho Exp $ - - 01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Cleanup due bug #144305 - - 18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Drop mobile herd as talked in gentoo-dev ML - - 08 Jun 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Drop maintainer from metadata as talked with him, bug #90641. - - 26 Feb 2009; Jim Ramsay <lack@gentoo.org> ChangeLog: - Version cleanup, plus added patch for 2.6.27 compatibility (Bug #244756) - - 15 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> - ipw3945-1.2.2-r1.ebuild: - amd64 stable wrt bug #207954 - - 17 Feb 2008; Joshua Jackson <tsunam@gentoo.org> ipw3945-1.2.2-r1.ebuild: - Stable x86 - -*ipw3945-1.2.2-r1 (11 Feb 2008) - - 11 Feb 2008; Jim Ramsay <lack@gentoo.org> - +files/ipw3945-1.2.2-kernel-2.6.24.patch, +ipw3945-1.2.2-r1.ebuild: - Added upstream patch for building with linux kernel 2.6.24 - - 06 Dec 2007; Christian Faulhammer <opfer@gentoo.org> ipw3945-1.2.2.ebuild: - stable x86, bug 197806 - - 05 Dec 2007; Christoph Mende <angelos@gentoo.org> ipw3945-1.2.2.ebuild: - Stable on amd64 wrt bug #197806 - - 25 Nov 2007; Stefan Schweizer <genstef@gentoo.org> - +files/ipw3945-1.2.2-build.patch, ipw3945-1.2.2.ebuild: - Fix build problems thanks to Alon Bar-Lev <alonbl@gentoo.org> in bug 195137 - - 05 Nov 2007; Jim Ramsay <lack@gentoo.org> metadata.xml: - Changing maintainers to myself, dang, and jkt - - 04 Nov 2007; Christian Heim <phreak@gentoo.org> metadata.xml: - Removing myself as the maintainer. - - 11 Sep 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.2.ebuild: - Small touchup modifications, thanks to Cristi Magherusan <majeru at - gentoo.ro> via Email. - - 09 Sep 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.2.ebuild: - Apparently 2.6.20 has the WIRELESS_EXT config option, removing the commented - out old checks. - -*ipw3945-1.2.2 (09 Sep 2007) - - 09 Sep 2007; Christian Heim <phreak@gentoo.org> +ipw3945-1.2.2.ebuild: - Version bump, fixing #171447 and #177869 (thanks to Momsen Reincke <mreincke - at gmx.net> for the preup snippet), #181443 (Mike Arthur <mike at - mikearthur.co.uk>, adding SHELL=/bin/bash to BUILD_PARAMS), #190595 - (genbug.z.sandcrawler at antichef.com). - - 10 Jul 2007; Stefan Schweizer <genstef@gentoo.org> ipw3945-1.0.5.ebuild, - ipw3945-1.2.0.ebuild, ipw3945-1.2.1.ebuild: - Fix CONFIG_CHECKs - - 20 May 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.1.ebuild: - Make ipw3945-1.2.1 aware of the changed CONFIG options of Linux 2.6.22 - (thanks to Momsen Reincke <mreincke at gmx.net> in #179028). - -*ipw3945-1.2.1 (20 May 2007) - - 20 May 2007; Christian Heim <phreak@gentoo.org> +ipw3945-1.2.1.ebuild: - Version bump (thanks to Pacho Ramos <pacho at condmat1.ciencias.uniovi.es> - in #177696). - - 13 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ipw3945-1.2.0.ebuild: - Stable on amd64/x86 wrt bug #166528. - - 10 Feb 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.0.ebuild: - Updating the ebuild to explicitely set KV_OBJ="ko". Looks like the linux-mod - eclass doesn't get KV_OBJ right (wrong /usr/src/linux symlink?), thus - resulting in a broken src_install. Thanks to Michael C. Delorme - <mike.delorme at gmail.com> (in #166152) and Jan Kundrát for pointing this - out. - - 10 Feb 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.0.ebuild: - Moving the linux_mod-pkg_setup around, Fixing #166152 (thanks to Jan). - - 09 Feb 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.0.ebuild: - Adding some information about the switch from net-wireless/ieee80211 to the - in-kernel ieee80211 subsystem. Thanks to Jakub for the initial patch. Also - cleaning up the ebuild itself a bit (removing obsoleted patches, sanatizing - epatch. - - 02 Feb 2007; Christian Heim <phreak@gentoo.org> - -files/ipw3945-1.1.3-Makefile.patch, -ipw3945-1.1.0.ebuild, - -ipw3945-1.1.0-r1.ebuild, -ipw3945-1.1.1.ebuild, -ipw3945-1.1.2.ebuild, - -ipw3945-1.1.3.ebuild, -ipw3945-1.1.3-r2.ebuild: - Cleaning out all the unstable, broken versions. - - 02 Feb 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.0.ebuild: - Adding BSD as LICENSE, as ipw3945_daemon.h is licensed under the BSD license. - -*ipw3945-1.2.0 (02 Feb 2007) - - 02 Feb 2007; Christian Heim <phreak@gentoo.org> - +files/ipw3945-1.2.0-Makefile.patch, +ipw3945-1.2.0.ebuild: - Version bump, Intel announced a new stable version for it's ipw3945 device - driver. - - 08 Jan 2007; Robin H. Johnson <robbat2@gentoo.org> - -ipw3945-1.1.3-r1.ebuild, ipw3945-1.1.3-r2.ebuild: - Check for kernel version. - -*ipw3945-1.1.3-r2 (08 Jan 2007) - - 08 Jan 2007; Robin H. Johnson <robbat2@gentoo.org> - +ipw3945-1.1.3-r2.ebuild: - Add support for 2.6.20, and essid name patch. - -*ipw3945-1.1.3-r1 (07 Jan 2007) - - 07 Jan 2007; Christian Heim <phreak@gentoo.org> - +files/ipw3945-1.1.3-Makefile.patch, +ipw3945-1.1.3-r1.ebuild: - Adding an updated ebuild, now relying on the in-kernel ieee80211. - - 28 Dec 2006; Piotr Jaroszyński <peper@gentoo.org> ipw3945-1.1.3.ebuild: - Add ~amd64 wrt bug #148674. - -*ipw3945-1.1.3 (16 Dec 2006) - - 16 Dec 2006; Christian Heim <phreak@gentoo.org> +ipw3945-1.1.3.ebuild: - Version bump, thanks to Pacho Ramos and Scott Van Der Wall in #157728. - - 07 Dec 2006; Christian Heim <phreak@gentoo.org> - +files/ipw3945-1.0.5-linux-2.6.19.patch, ipw3945-1.0.5.ebuild: - Adding a patch for ipw3945-1.0.5 compilation against linux-2.6.19 (thanks to - Scott Van Der Wall <svdw@udel.edu> for the patch - #157076 - and Stefan for bugging me - about it). - - 07 Dec 2006; Christian Heim <phreak@gentoo.org> metadata.xml: - Adding Seemant as secondary maintainer. - -*ipw3945-1.1.2 (04 Nov 2006) -*ipw3945-1.1.1 (04 Nov 2006) - - 04 Nov 2006; Christian Heim <phreak@gentoo.org> +ipw3945-1.1.1.ebuild, - +ipw3945-1.1.2.ebuild: - Version bump, adding ipw3945-1.1.1 and ipw3945-1.1.2. - -*ipw3945-1.1.0-r1 (16 Sep 2006) - - 16 Sep 2006; Christian Heim <phreak@gentoo.org> +ipw3945-1.1.0-r1.ebuild: - Adding a hard depend onto net-wireless/ieee80211-1.1.13-r1 for - ipw3945-1.1.0, seems like everything above is broken. This is resolving bug - #147546. - -*ipw3945-1.1.0 (11 Aug 2006) - - 11 Aug 2006; Christian Heim <phreak@gentoo.org> - -ipw3945-1.1.0_pre2.ebuild, +ipw3945-1.1.0.ebuild: - Version bump. Fixing #143532 (thanks to Jared Greenwald for reporting). - - 14 Jul 2006; Christian Heim <phreak@gentoo.org> ipw3945-1.1.0_pre2.ebuild: - Fixing $S, fixing bug #140339 (thanks to Patrick <mail at - patrick-nagel.net> for reporting) - -*ipw3945-1.1.0_pre2 (13 Jul 2006) - - 13 Jul 2006; Christian Heim <phreak@gentoo.org> metadata.xml, - +ipw3945-1.1.0_pre2.ebuild: - Version bump; Taking temporary maintainership - - 25 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> - -ipw3945-0.0.74.ebuild, -ipw3945-1.0.1.ebuild, -ipw3945-1.0.2.ebuild, - -ipw3945-1.0.3.ebuild: - Pruned old versions. - - 05 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> ipw3945-1.0.5.ebuild: - Stable on x86. - -*ipw3945-1.0.5 (27 May 2006) - - 27 May 2006; Henrik Brix Andersen <brix@gentoo.org> +ipw3945-1.0.5.ebuild: - Version bump. - -*ipw3945-1.0.3 (05 May 2006) - - 05 May 2006; Henrik Brix Andersen <brix@gentoo.org> +ipw3945-1.0.3.ebuild: - Version bump. - -*ipw3945-1.0.2 (26 Apr 2006) - - 26 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> +ipw3945-1.0.2.ebuild: - Version bump. - -*ipw3945-1.0.1 (21 Apr 2006) - - 21 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> +ipw3945-1.0.1.ebuild: - Version bump. Fixes bug #130438. - -*ipw3945-0.0.74 (13 Apr 2006) - - 13 Apr 2006; Henrik Brix Andersen <brix@gentoo.org> +metadata.xml, - +ipw3945-0.0.74.ebuild: - Initial version. Thank you to Intel's Open Source Technology Center for - sponsoring the hardware for testing this. diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest deleted file mode 100644 index eca8a3e0f097..000000000000 --- a/net-wireless/ipw3945/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX ipw3945-1.2.2-build.patch 2570 SHA256 f0c3eab6452927ec28d051c035c819050765235989a7267efad257171597be08 SHA512 46ddf87caa55a1b73cc21186fc371a6eaf60b348e14a030a8cfaa4773f69eb87607af94b51166f5827de17709c6a868da1661fc4b6d68fe0acc22cb3e6200f54 WHIRLPOOL e9a9dde1709ba2b29eab221bf546d16cd46c7a5ce2350f6d40e7f6b99ce4535aa075218e05c229098a35798f20006f81780ecb33e952b255de7b47bcddcc0eed -AUX ipw3945-1.2.2-kernel-2.6.24.patch 545 SHA256 27e3ab51b32b1a9c711f5ccf2be2a3517433290f8fdaeafebd2319664132ab4a SHA512 74cff690fc77e3864d37ea9c4026331effa3295fbae889e7c7454b7bf02d05247d07373d623f4af6fc520ee790480d493fe56f4efe0d4642f2b725cef994632b WHIRLPOOL 6626bca1e003df38d0e94f337cdcdfef74d589090d7206b138f42fb7f7cb9e68c0a3b020094c8f52563f87f95086a4262f6a10ea725d9c9de475863111356e0e -AUX ipw3945-1.2.2-kernel-2.6.27.patch 4696 SHA256 a7814489b09110bd1142bff535f5f30944586089ca152aa1dcf494dd366451d3 SHA512 bab25d2eb75c3d0a78be25fda22017f76c91bf8f9baca64ff78adb414772b45030f4fe4eca62aed9bf042e838545fef49d437d3bc482ca7b0e530b86e7f9861e WHIRLPOOL b3974d3ca80d984c145361dc3f07ce46618ddcf25670eb65ad2905f225e2a4ff25b3480bff279792af87ef7cb3538d83a2de5fd319936d61ac4cdb6efeaf07e1 -DIST ipw3945-1.2.2.tgz 201005 SHA256 abd62b5e7f85a680e1bd22237e9dde93e9eb8830cbdf458dc9cebe7f887d4dde -EBUILD ipw3945-1.2.2-r1.ebuild 3490 SHA256 468205d182e87df6b782498fdd21965e7e65ca89e85eca811c2c2798946932af SHA512 0b9759a516cbdd3d880d939fc85daf3f5109a4bc058c72420a0e08ba7c33b309ec1c9c22750561f1068fde562a05fd4d3ba0ffb091346cee6bae630941352b2b WHIRLPOOL 7ca3c8030ab7977926ab23e160733349d926c396734f7a8314e4f909bd863f0e5d843eac6c0d9025918e9645e7087df40d62ac2ac466b9792bbe8b28d5ff67ac -MISC ChangeLog 7824 SHA256 92857c1190f22f901e40f359f0c45adbdd80cd602836907efbcb310d2b4433ab SHA512 1b101efc817d20779e2647631b66effae18f75879b6fba8ef8f90dba7c4e579f33599590dff103d1c5c922cf5371e51c0b204309424239673a08a936a6a5163e WHIRLPOOL 7c05e125e669e3add9ded5dd1e1c6734b6deeb9356ac94f73b8b6dd44a6a3a51d202a2a4db4ffd8a4eb860546e623b1a30344a05612e6e1424f0340842bba99c -MISC metadata.xml 227 SHA256 119a5ce8f1e2499def754e1b2042da8c120ecc2f471e8446a5341a0f6da6073b SHA512 66fe8c0e5d34797ea9fca16b382906b6ffb79c547b84eaf0500c8db6eddbc207e38f9e3ca1b8690cc611930d703aeb002e3374af0e8ddf7785e16cc47a774e33 WHIRLPOOL f75bba28ccea6bef642976e01cf1d2d8d3f8b858141443878e28356707e4802692c633611d1cc7c9d37a642fa2eeafbc024feaadfd802ca2eaf175aaf39ddfa8 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlGp2VQACgkQCaWpQKGI+9TbZACdFRq4vcaaOeyJNdfquKqJ4V+/ -it0AniHslN44C4DEXTIv/CX2riGhryKU -=fli6 ------END PGP SIGNATURE----- diff --git a/net-wireless/ipw3945/files/ipw3945-1.2.2-build.patch b/net-wireless/ipw3945/files/ipw3945-1.2.2-build.patch deleted file mode 100644 index 4eb147d09f1d..000000000000 --- a/net-wireless/ipw3945/files/ipw3945-1.2.2-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urNp ipw3945-1.2.2.org/Makefile ipw3945-1.2.2/Makefile ---- ipw3945-1.2.2.org/Makefile 2007-04-30 06:44:56.000000000 +0300 -+++ ipw3945-1.2.2/Makefile 2007-11-14 19:23:07.000000000 +0200 -@@ -111,7 +111,7 @@ IEEE80211_API := $(shell $(DIR)/snapshot - EXTRA_CFLAGS += -DIPW3945_COMPAT=$(IEEE80211_API) - - ifeq ($(CONFIG_IPW3945_DEBUG),y) -- EXTRA_CFLAGS += -g -Wa,-adhlms=$@.lst -+ EXTRA_CFLAGS += -g -Wa,-adhlms=$(T)/$@.lst - endif - - ifdef KBUILD_EXTMOD -@@ -193,34 +193,6 @@ utils: - @[ ! -d util ] || make -C util IEEE80211_PATH=$(IEEE80211_PATH) - - check_inc: -- @( [ "$(IEEE80211_DUPLICATE)" ] && echo -e \ --"\n WARNING: Your kernel contains ieee80211 symbol definitions and you\n"\ --"are not using the kernel's default ieee80211 subsystem. (Perhaps you\n"\ --"used the out-of-tree ieee80211 subsystem's 'make install' or have\n"\ --"provided a path to the ieee80211 subsystem via IEEE80211_INC.)\n\n"\ --"If you wish to use the out-of-tree ieee80211 subsystem then it is\n"\ --"recommended to use that projects' \"make patch_kernel\" facility\n"\ --"and rebuild your kernel to update the Module symbol version information.\n"\ --"\n"\ --"Failure to do this may result in build warnings and unexpected\n"\ --"behavior when running modules which rely on the ieee80211 subsystem.\n\n"\ || \ -- exit 0) -- -- @( [ "$(IEEE80211_DUPLICATE)" ] && \ -- [ ! "$(IEEE80211_IGNORE_DUPLICATE)" ] && echo -e \ --" Aborting the build. You can force the build to continue by adding:\n\n"\ --"\tIEEE80211_IGNORE_DUPLICATE=y\n\n"\ --"to your make command line.\n\n" && exit 1 || exit 0) -- -- @( [ ! "$(IEEE80211_API)" ] && echo -e \ --"\n ERROR: A compatible subsystem was not found in the following path[s]:\n\n"\ --"\t$(IEEE80211_RES)\n\n"\ --"You need to install the ieee80211 subsystem from http://ieee80211.sf.net\n"\ --"and point this build to the location where you installed those sources, eg.:\n\n"\ --"\t% make IEEE80211_INC=/usr/src/ieee80211/\n\n"\ --"or use the 'make patch_kernel' within the ieee80211 subsystem to patch your\n"\ --"kernel sources.\n" && exit 1 || exit 0) -- - @echo -e \ - " Using ieee80211 subsystem version API v$(IEEE80211_API) from:\n\n" \ - "\tBase: $(IEEE80211_BASE)\n" \ -@@ -241,7 +213,7 @@ codingstyle: - - clean: - @[ ! -d util ] || make -C util clean || true -- rm -f *.{mod.c,mod,o,ko,rej,orig} .*.{stamp,flags,cmd} .lst *.lst *~ -+ rm -f *.{mod.c,mod,o,ko,rej,orig} .*.{stamp,flags,cmd} $(T)/.lst $(T)/*.lst *~ - rm -rf $(DIR)/tmp $(DIR)/.tmp_versions Module.symvers Modules.symvers - for file in *.{c,h}; do \ - sed -i -e "s:\ *$$::g" -e "s:\t*$$::g" $$file; \ diff --git a/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch b/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch deleted file mode 100644 index 27f7304d7f01..000000000000 --- a/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ipw3945.h.orig 2007-07-31 09:53:39.000000000 +0300 -+++ ipw3945.h 2007-12-23 04:09:59.000000000 +0200 -@@ -2414,6 +2414,18 @@ enum { - #define IPW_ORD_TABLE_7_MASK 0x0000F700 - - /* -+ * For backword Kernel compatibility (after 2.6.24) -+ */ -+#if !defined(MAC_ARG) -+#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] -+#endif -+ -+#if !defined(SET_MODULE_OWNER) -+#define SET_MODULE_OWNER(dev) do { } while (0) -+#endif -+ -+ -+/* - * Table 0 Entries (all entries are 32 bits) - */ - enum { diff --git a/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.27.patch b/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.27.patch deleted file mode 100644 index d1d64ce72e79..000000000000 --- a/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.27.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- ipw3945-1.2.2/ipw3945.c.old 2008-10-19 23:03:47.000000000 +0200 -+++ ipw3945-1.2.2/ipw3945.c 2008-10-19 23:25:43.000000000 +0200 -@@ -108,6 +108,8 @@ - #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" - #define DRV_VERSION IPW3945_VERSION - -+#define IPW3945_COMPAT 2 -+ - MODULE_DESCRIPTION(DRV_DESCRIPTION); - MODULE_VERSION(DRV_VERSION); - MODULE_AUTHOR(DRV_COPYRIGHT); -@@ -141,6 +143,153 @@ static int from_priority_to_tx_queue[] = - IPW_TX_QUEUE_3, IPW_TX_QUEUE_3, IPW_TX_QUEUE_4, IPW_TX_QUEUE_4 - }; - -+static int ieee80211_encrypt_fragment(struct ieee80211_device *ieee, -+ struct sk_buff *frag, int hdr_len) -+{ -+ struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; -+ int res; -+ -+ if (crypt == NULL) -+ return -1; -+ -+ /* To encrypt, frame format is: -+ * IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */ -+ atomic_inc(&crypt->refcnt); -+ res = 0; -+ if (crypt->ops && crypt->ops->encrypt_mpdu) -+ res = crypt->ops->encrypt_mpdu(frag, hdr_len, crypt->priv); -+ -+ atomic_dec(&crypt->refcnt); -+ if (res < 0) { -+ printk(KERN_INFO "%s: Encryption failed: len=%d.\n", -+ ieee->dev->name, frag->len); -+ ieee->ieee_stats.tx_discards++; -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, -+ int headroom, gfp_t gfp_mask) -+{ -+ struct ieee80211_txb *txb; -+ int i; -+ txb = kmalloc(sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags), -+ gfp_mask); -+ if (!txb) -+ return NULL; -+ -+ memset(txb, 0, sizeof(struct ieee80211_txb)); -+ txb->nr_frags = nr_frags; -+ txb->frag_size = txb_size; -+ -+ for (i = 0; i < nr_frags; i++) { -+ txb->fragments[i] = __dev_alloc_skb(txb_size + headroom, -+ gfp_mask); -+ if (unlikely(!txb->fragments[i])) { -+ i--; -+ break; -+ } -+ skb_reserve(txb->fragments[i], headroom); -+ } -+ if (unlikely(i != nr_frags)) { -+ while (i >= 0) -+ dev_kfree_skb_any(txb->fragments[i--]); -+ kfree(txb); -+ return NULL; -+ } -+ return txb; -+} -+ -+ -+/* Incoming 802.11 strucure is converted to a TXB -+ * a block of 802.11 fragment packets (stored as skbs) */ -+int ieee80211_tx_frame(struct ieee80211_device *ieee, -+ struct ieee80211_hdr *frame, int hdr_len, int total_len, -+ int encrypt_mpdu) -+{ -+ struct ieee80211_txb *txb = NULL; -+ unsigned long flags; -+ struct net_device_stats *stats = &ieee->stats; -+ struct sk_buff *skb_frag; -+ int priority = -1; -+ int fraglen = total_len; -+ int headroom = ieee->tx_headroom; -+ struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; -+ -+ spin_lock_irqsave(&ieee->lock, flags); -+ -+ if (encrypt_mpdu && (!ieee->sec.encrypt || !crypt)) -+ encrypt_mpdu = 0; -+ -+ /* If there is no driver handler to take the TXB, dont' bother -+ * creating it... */ -+ if (!ieee->hard_start_xmit) { -+ printk(KERN_WARNING "%s: No xmit handler.\n", ieee->dev->name); -+ goto success; -+ } -+ -+ if (unlikely(total_len < 24)) { -+ printk(KERN_WARNING "%s: skb too small (%d).\n", -+ ieee->dev->name, total_len); -+ goto success; -+ } -+ -+ if (encrypt_mpdu) { -+ frame->frame_ctl |= cpu_to_le16(IEEE80211_FCTL_PROTECTED); -+ fraglen += crypt->ops->extra_mpdu_prefix_len + -+ crypt->ops->extra_mpdu_postfix_len; -+ headroom += crypt->ops->extra_mpdu_prefix_len; -+ } -+ -+ /* When we allocate the TXB we allocate enough space for the reserve -+ * and full fragment bytes (bytes_per_frag doesn't include prefix, -+ * postfix, header, FCS, etc.) */ -+ txb = ieee80211_alloc_txb(1, fraglen, headroom, GFP_ATOMIC); -+ if (unlikely(!txb)) { -+ printk(KERN_WARNING "%s: Could not allocate TXB\n", -+ ieee->dev->name); -+ goto failed; -+ } -+ txb->encrypted = 0; -+ txb->payload_size = fraglen; -+ -+ skb_frag = txb->fragments[0]; -+ -+ memcpy(skb_put(skb_frag, total_len), frame, total_len); -+ -+ if (ieee->config & -+ (CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS)) -+ skb_put(skb_frag, 4); -+ -+ /* To avoid overcomplicating things, we do the corner-case frame -+ * encryption in software. The only real situation where encryption is -+ * needed here is during software-based shared key authentication. */ -+ if (encrypt_mpdu) -+ ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); -+ -+ success: -+ spin_unlock_irqrestore(&ieee->lock, flags); -+ -+ if (txb) { -+ if ((*ieee->hard_start_xmit) (txb, ieee->dev, priority) == 0) { -+ stats->tx_packets++; -+ stats->tx_bytes += txb->payload_size; -+ return 0; -+ } -+ ieee80211_txb_free(txb); -+ } -+ return 0; -+ -+ failed: -+ spin_unlock_irqrestore(&ieee->lock, flags); -+ stats->tx_errors++; -+ return 1; -+} -+ -+ -+ - static int ipw_rate_scale_init_handle(struct ipw_priv *priv, s32 window_size); - - static int ipw_update_power_cmd(struct ipw_priv *priv, diff --git a/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild b/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild deleted file mode 100644 index 491665b4f956..000000000000 --- a/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild,v 1.4 2009/02/26 23:52:04 lack Exp $ - -inherit linux-mod eutils - -S=${WORKDIR}/${P/_pre/-pre} - -UCODE_VERSION="1.14.2" -DAEMON_VERSION="1.7.22" - -DESCRIPTION="Driver for the Intel PRO/Wireless 3945ABG miniPCI express adapter" -HOMEPAGE="http://ipw3945.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug" -RDEPEND=">=net-wireless/ipw3945-ucode-${UCODE_VERSION} - >=net-wireless/ipw3945d-${DAEMON_VERSION}" - -BUILD_TARGETS="all" -MODULE_NAMES="ipw3945(net/wireless:)" -MODULESD_IPW3945_DOCS="README.ipw3945" -KV_OBJ="ko" - -CONFIG_CHECK="WIRELESS_EXT FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP" -ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)." -ERROR_IEEE80211="${P} requires support for Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211)." - -pkg_setup() { - if kernel_is 2 4; then - die "${P} does not support building against kernel 2.4.x" - fi - - if kernel_is lt 2 6 18; then - die "${P} needs a kernel >=2.6.18! Please set your KERNEL_DIR or /usr/src/linux suitably" - fi - - linux-mod_pkg_setup - - BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} SHELL=/bin/bash" - BUILD_PARAMS="${BUILD_PARAMS} T=${T}" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_MONITOR=y CONFIG_IEEE80211_RADIOTAP=y CONFIG_IPW3945_PROMISCUOUS=y" - if use debug; then - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_DEBUG=y" - else - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_DEBUG=n" - fi - - # users don't read the ChangeLog and wonder why the kernel check fails - # (1) check if the kernel dir (/usr/src/linux) is missing ieee80211 - - if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] && \ - [[ -f ${KV_OUT_DIR}/include/config/ieee80211.h ]] && \ - egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_OUT_DIR}/include/linux/autoconf.h; then - return 0 - else - echo - ewarn "${CATEGORY}/${PF} does NOT use net-wireless/ieee80211 any more." - ewarn "We are now relying on the in-kernel ieee80211 instead." - echo - eerror "Please remove net-wireless/ieee80211 using emerge, and remerge" - eerror "your current kernel (${KV_FULL}), as it has been altered" - eerror "by net-wireless/ieee80211." - die "Incompatible ieee80211 subsystem detected in ${KV_FULL}" - fi -} - -src_unpack() { - unpack ${P/_pre/-pre}.tgz - cd "${S}" - epatch "${FILESDIR}/${P}-build.patch" - if kernel_is ge 2 6 24; then - epatch "${FILESDIR}/${P}-kernel-2.6.24.patch" - fi - if kernel_is ge 2 6 27; then - epatch "${FILESDIR}/${P}-kernel-2.6.27.patch" - fi -} - -src_install() { - linux-mod_src_install - dodoc CHANGES ISSUES -} - -pkg_postinst() { - ewarn "The ipw3945 driver is deprecated since the fully open iwl3945 driver" - ewarn "is present in the 2.6.24 linux kernel. Please try using the new" - ewarn "driver first, and help improve it by reporting any problems you may" - ewarn "have." - echo - elog "If you want your wireless device started up by udev, please make sure" - elog "you add something like this to your /etc/conf.d/net:" - elog "preup() {" - elog " if [[ \${IFACE} = \"wlan0\" ]]; then" - elog " sleep 3" - elog " fi" - elog " return 0" - elog "}" - elog "Otherwise, you're going to hit bug #177869 since the driver needs some" - elog "time to initialize and thus, baselayout is going to start it even if" - elog "the device isn't useable yet." -} diff --git a/net-wireless/ipw3945/metadata.xml b/net-wireless/ipw3945/metadata.xml deleted file mode 100644 index fad1b32eca1f..000000000000 --- a/net-wireless/ipw3945/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>jkt@gentoo.org</email> - <name>Jan Kundrat</name> - </maintainer> -</pkgmetadata> |