[oe-commits] org.oe.oz354x linux-oz 2.6.16: added HACK which remove some cards from orinoco_cs driver in favor of hostap_cs

[hrw commit]

linux-oz 2.6.16: added HACK which remove some cards from orinoco_cs driver in favor of hostap_cs

Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 960f0d19238331a0de71a6bf94aef7f26a449860
ViewMTN: http://monotone.openembedded.org/revision.psp?id=960f0d19238331a0de71a6bf94aef7f26a449860
Files:
1
packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-openzaurus_2.6.16.bb
Diffs:

#
# mt diff -r82a4051935d7100d57b53a974a43338373444a39 -r960f0d19238331a0de71a6bf94aef7f26a449860
#
# 
# 
# patch "packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch"
#  from [e9c83d22d838e5d5780945f0c6b998193596d924]
#    to [c6490220b37360e2fc3b32fccca559370e5cbd5d]
# 
# patch "packages/linux/linux-openzaurus_2.6.16.bb"
#  from [24c44aeab9c822fc25389257406dcb85c1653816]
#    to [1d00854451afadd11002fa7f6ba72a5c348546d7]
# 
============================================================
--- packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch	e9c83d22d838e5d5780945f0c6b998193596d924
+++ packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch	c6490220b37360e2fc3b32fccca559370e5cbd5d
@@ -5,11 +5,11 @@ Signed-off-by: Marcin Juszkiewicz <opene
 
 Signed-off-by: Marcin Juszkiewicz <openembedded at hrw.one.pl>
 
-Index: linux/drivers/net/wireless/orinoco_cs.c
+Index: linux-2.6.16/drivers/net/wireless/orinoco_cs.c
 ===================================================================
---- linux.orig/drivers/net/wireless/orinoco_cs.c	2006-08-23 16:04:10.000000000 +0200
-+++ linux/drivers/net/wireless/orinoco_cs.c	2006-08-23 16:17:43.000000000 +0200
-@@ -453,33 +453,21 @@
+--- linux-2.6.16.orig/drivers/net/wireless/orinoco_cs.c	2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/drivers/net/wireless/orinoco_cs.c	2006-09-15 21:30:42.925780000 +0200
+@@ -515,33 +515,20 @@
  	"Pavel Roskin <proski at gnu.org>, et al)";
  
  static struct pcmcia_device_id orinoco_cs_ids[] = {
@@ -30,7 +30,7 @@ Index: linux/drivers/net/wireless/orinoc
 -	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), /* Linksys WPC11 Version 2.5 */
 -	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), /* Linksys WPC11 Version 3 */
 -	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), /* Compaq HNW-100 11 Mbps Wireless Adapter */
- 	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */
+-	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */
 -	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), /* ASUS SpaceLink WL-100 */
  	PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), /* SpeedStream SS1021 Wireless Adapter */
  	PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), /* PLANEX RoadLannerWave GW-NS11H */
@@ -43,7 +43,7 @@ Index: linux/drivers/net/wireless/orinoc
  	PCMCIA_DEVICE_PROD_ID12(" ", "IEEE 802.11 Wireless LAN/PC Card", 0x3b6e20c8, 0xefccafe9),
  	PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3),
  	PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),
-@@ -487,31 +475,25 @@
+@@ -549,31 +536,25 @@
  	PCMCIA_DEVICE_PROD_ID123("AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863", 0xea569531, 0x4bcb9645, 0x355cb092),
  	PCMCIA_DEVICE_PROD_ID12("Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", 0x5cd01705, 0x4271660f),
  	PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842),
@@ -75,7 +75,14 @@ Index: linux/drivers/net/wireless/orinoc
  	PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a),
  	PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410),
  	PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3),
-@@ -529,10 +511,8 @@
+@@ -584,17 +565,14 @@
+ 	PCMCIA_DEVICE_PROD_ID12("Nortel Networks", "emobility 802.11 Wireless LAN PC Card", 0x2d617ea0, 0x88cd5767),
+ 	PCMCIA_DEVICE_PROD_ID12("OEM", "PRISM2 IEEE 802.11 PC-Card", 0xfea54c90, 0x48f2bdd6),
+ 	PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card", 0x4ac44287, 0x235a6bed),
+-	PCMCIA_DEVICE_PROD_ID123("PCMCIA", "11M WLAN Card v2.5", "ISL37300P", 0x281f1c5d, 0x6e440487, 0xc9049a39),
+ 	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264),
+ 	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110", 0x209f40ab, 0x46263178),
+ 	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
  	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
  	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
  	PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757),
============================================================
--- packages/linux/linux-openzaurus_2.6.16.bb	24c44aeab9c822fc25389257406dcb85c1653816
+++ packages/linux/linux-openzaurus_2.6.16.bb	1d00854451afadd11002fa7f6ba72a5c348546d7
@@ -1,6 +1,6 @@ require linux-openzaurus.inc
 require linux-openzaurus.inc
 
-PR = "r46"
+PR = "r47"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -105,6 +105,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
            ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \
            file://pxa-serial-hack.patch;patch=1;status=hack \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+           file://orinoco-remove-all-which-are-in-hostap-HACK.patch;patch=1;status=unmergable-hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \