rpms/kernel/FC-4 kernel-2.6.spec, 1.1591.2.3, 1.1591.2.4 3646-wireless-add-prism54usb-driver.txt, 1.1.2.1, NONE 3663-prism54usb-fix-build-break-in-islusb_init.c.txt, 1.1.2.1, NONE

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28559

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc4-9-branch
	3646-wireless-add-prism54usb-driver.txt 
	3663-prism54usb-fix-build-break-in-islusb_init.c.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.2.3
retrieving revision 1.1591.2.4
diff -u -r1.1591.2.3 -r1.1591.2.4
--- kernel-2.6.spec	4 Feb 2006 01:09:51 -0000	1.1591.2.3
+++ kernel-2.6.spec	4 Feb 2006 04:13:49 -0000	1.1591.2.4
@@ -933,99 +933,97 @@
 Patch20551: 3643-NET-Fix-some-whitespace-issues-in-af_packet.c.txt
 Patch20552: 3644-SUNGEM-Make-PM-of-PHYs-more-reliable-2.txt
 Patch20553: 3645-NET-Fix-skb-fclone-error-path-handling.txt
-Patch20554: 3646-wireless-add-prism54usb-driver.txt
-Patch20555: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
-Patch20556: 3656-AF_KEY-no-message-type-set.txt
-Patch20557: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
-Patch20558: 3663-prism54usb-fix-build-break-in-islusb_init.c.txt
-Patch20559: 3688-sundance-Really-read-addr-0.txt
-Patch20560: 3689-bonding-fix-get_settings-error-checking.txt
-Patch20561: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
-Patch20562: 3691-b44-fix-laptop-carrier-detect.txt
-Patch20563: 3692-s2io-scatter-gather-fix.txt
-Patch20564: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
-Patch20565: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
-Patch20566: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
-Patch20567: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
-Patch20568: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
-Patch20569: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
-Patch20570: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
-Patch20571: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
-Patch20572: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
-Patch20573: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
-Patch20574: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
-Patch20575: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
-Patch20576: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
-Patch20577: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
-Patch20578: 3717-ieee80211-Add-LEAP-authentication-type.txt
-Patch20579: 3718-ieee80211-add-flags-for-all-geo-channels.txt
-Patch20580: 3719-ieee80211-Add-spectrum-management-information.txt
-Patch20581: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
-Patch20582: 3721-ieee80211-TIM-information-element-parsing.txt
-Patch20583: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
-Patch20584: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
-Patch20585: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
-Patch20586: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
-Patch20587: 3753-sync-with-svn.berlios.de.txt
-Patch20588: 3754-remove-linux-version-compatibility-code.txt
-Patch20589: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
-Patch20590: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
-Patch20591: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
-Patch20592: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
-Patch20593: 3762-Typo-corrections-for-ieee80211.txt
-Patch20594: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
-Patch20595: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
-Patch20596: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
-Patch20597: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
-Patch20598: 3774-AIRO-_CS-CRYPTO-fixes.txt
-Patch20599: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
-Patch20600: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
-Patch20601: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
-Patch20602: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
-Patch20603: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
-Patch20604: 3780-ipw2100-Add-generic-geo-information.txt
-Patch20605: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
-Patch20606: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
-Patch20607: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
-Patch20608: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
-Patch20609: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
-Patch20610: 3786-ipw2200-Bluetooth-coexistence-support.txt
-Patch20611: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
-Patch20612: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
-Patch20613: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
-Patch20614: 3791-ipw2200-stack-reduction.txt
-Patch20615: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
-Patch20616: 3793-ipw2200-increase-ipw2200-driver-version.txt
-Patch20617: 3796-ipw2200-Disable-hwcrypto-by-default.txt
-Patch20618: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
-Patch20619: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
-Patch20620: 3800-IPV4-igmp-remove-pointless-printk.txt
-Patch20621: 3801-TCP-H-TCP-Fix-accounting.txt
-Patch20622: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
-Patch20623: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
-Patch20624: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
-Patch20625: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
-Patch20626: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
-Patch20627: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
-Patch20628: 3904-BRIDGE-Fix-device-delete-race.txt
-Patch20629: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
-Patch20630: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
-Patch20631: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
-Patch20632: 3962-lp486e-remove-SLOW_DOWN_IO.txt
-Patch20633: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
-Patch20634: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
-Patch20635: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
-Patch20636: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
-Patch20637: 4128-NET-snap-needs-hardware-checksum-fix.txt
-Patch20638: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
-Patch20639: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
-Patch20640: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
-Patch20641: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
-Patch20642: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
-Patch20643: 4136-TG3-Flush-tg3_reset_task.txt
-Patch20644: 4137-TG3-Update-driver-version-and-release-date.txt
-Patch20645: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
-Patch20646: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
+Patch20554: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
+Patch20555: 3656-AF_KEY-no-message-type-set.txt
+Patch20556: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
+Patch20557: 3688-sundance-Really-read-addr-0.txt
+Patch20558: 3689-bonding-fix-get_settings-error-checking.txt
+Patch20559: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
+Patch20560: 3691-b44-fix-laptop-carrier-detect.txt
+Patch20561: 3692-s2io-scatter-gather-fix.txt
+Patch20562: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
+Patch20563: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
+Patch20564: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
+Patch20565: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
+Patch20566: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
+Patch20567: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
+Patch20568: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
+Patch20569: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
+Patch20570: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
+Patch20571: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
+Patch20572: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
+Patch20573: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
+Patch20574: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
+Patch20575: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
+Patch20576: 3717-ieee80211-Add-LEAP-authentication-type.txt
+Patch20577: 3718-ieee80211-add-flags-for-all-geo-channels.txt
+Patch20578: 3719-ieee80211-Add-spectrum-management-information.txt
+Patch20579: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
+Patch20580: 3721-ieee80211-TIM-information-element-parsing.txt
+Patch20581: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
+Patch20582: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
+Patch20583: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
+Patch20584: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
+Patch20585: 3753-sync-with-svn.berlios.de.txt
+Patch20586: 3754-remove-linux-version-compatibility-code.txt
+Patch20587: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
+Patch20588: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
+Patch20589: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
+Patch20590: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
+Patch20591: 3762-Typo-corrections-for-ieee80211.txt
+Patch20592: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
+Patch20593: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
+Patch20594: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
+Patch20595: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
+Patch20596: 3774-AIRO-_CS-CRYPTO-fixes.txt
+Patch20597: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
+Patch20598: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
+Patch20599: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
+Patch20600: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
+Patch20601: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
+Patch20602: 3780-ipw2100-Add-generic-geo-information.txt
+Patch20603: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
+Patch20604: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
+Patch20605: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
+Patch20606: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
+Patch20607: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
+Patch20608: 3786-ipw2200-Bluetooth-coexistence-support.txt
+Patch20609: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
+Patch20610: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
+Patch20611: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
+Patch20612: 3791-ipw2200-stack-reduction.txt
+Patch20613: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
+Patch20614: 3793-ipw2200-increase-ipw2200-driver-version.txt
+Patch20615: 3796-ipw2200-Disable-hwcrypto-by-default.txt
+Patch20616: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
+Patch20617: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
+Patch20618: 3800-IPV4-igmp-remove-pointless-printk.txt
+Patch20619: 3801-TCP-H-TCP-Fix-accounting.txt
+Patch20620: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
+Patch20621: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
+Patch20622: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
+Patch20623: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
+Patch20624: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
+Patch20625: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
+Patch20626: 3904-BRIDGE-Fix-device-delete-race.txt
+Patch20627: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
+Patch20628: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
+Patch20629: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
+Patch20630: 3962-lp486e-remove-SLOW_DOWN_IO.txt
+Patch20631: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
+Patch20632: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
+Patch20633: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
+Patch20634: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
+Patch20635: 4128-NET-snap-needs-hardware-checksum-fix.txt
+Patch20636: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
+Patch20637: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
+Patch20638: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
+Patch20639: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
+Patch20640: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
+Patch20641: 4136-TG3-Flush-tg3_reset_task.txt
+Patch20642: 4137-TG3-Update-driver-version-and-release-date.txt
+Patch20643: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
+Patch20644: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2591,192 +2589,188 @@
 %patch20552 -p1
 # [NET]: Fix skb fclone error path handling.
 %patch20553 -p1
-# wireless: add prism54usb driver
-%patch20554 -p1
 # [BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
-%patch20555 -p1
+%patch20554 -p1
 # [AF_KEY]: no message type set
-%patch20556 -p1
+%patch20555 -p1
 # [IPV6] MLDv2: fix change records when transitioning to/from inactive
-%patch20557 -p1
-# prism54usb: fix build break in islusb_init.c
-%patch20558 -p1
+%patch20556 -p1
 # sundance: Really read addr 0
-%patch20559 -p1
+%patch20557 -p1
 # bonding: fix ->get_settings error checking
-%patch20560 -p1
+%patch20558 -p1
 # acenic: fix checking of read_eeprom_byte() return values
-%patch20561 -p1
+%patch20559 -p1
 # b44: fix laptop carrier detect
-%patch20562 -p1
+%patch20560 -p1
 # s2io: scatter-gather fix
-%patch20563 -p1
+%patch20561 -p1
 # BUG_ON() Conversion in net/tulip/xircom_cb.c
-%patch20564 -p1
+%patch20562 -p1
 # BUG_ON() Conversion in net/tulip/de2104x.c
-%patch20565 -p1
+%patch20563 -p1
 # BUG_ON() Conversion in net/tulip/winbond-840.c
-%patch20566 -p1
+%patch20564 -p1
 # mv643xx_eth: Fix spinlock recursion bug
-%patch20567 -p1
+%patch20565 -p1
 # mv643xx_eth: Update dev->last_rx on packet receive
-%patch20568 -p1
+%patch20566 -p1
 # mv643xx_eth: Remove needless mp->port_mac_addr
-%patch20569 -p1
+%patch20567 -p1
 # mv643xx_eth: Make port queue enable/disable code consistent
-%patch20570 -p1
+%patch20568 -p1
 # mv643xx_eth: use MII library for PHY management
-%patch20571 -p1
+%patch20569 -p1
 # orinoco_cs: tweak Vcc debugging messages
-%patch20572 -p1
+%patch20570 -p1
 # ieee80211: Fix problem with not decrypting broadcast packets
-%patch20573 -p1
+%patch20571 -p1
 # ieee80211: Fix iwlist scan can only show about 20 APs
-%patch20574 -p1
+%patch20572 -p1
 # ieee80211: Fix A band min and max channel definitions
-%patch20575 -p1
+%patch20573 -p1
 # WEP fields are incorrectly shown to be INSIDE snap in the doc
-%patch20576 -p1
+%patch20574 -p1
 # ieee80211: Log if netif_rx() drops the packet
-%patch20577 -p1
+%patch20575 -p1
 # ieee80211: Add LEAP authentication type
-%patch20578 -p1
+%patch20576 -p1
 # ieee80211: add flags for all geo channels
-%patch20579 -p1
+%patch20577 -p1
 # ieee80211: Add spectrum management information
-%patch20580 -p1
+%patch20578 -p1
 # ieee80211: kmalloc+memset -> kzalloc cleanups
-%patch20581 -p1
+%patch20579 -p1
 # ieee80211: TIM information element parsing
-%patch20582 -p1
+%patch20580 -p1
 # ieee80211: Add TKIP crypt->build_iv
-%patch20583 -p1
+%patch20581 -p1
 # ieee80211: Add 802.11h data type and structures
-%patch20584 -p1
+%patch20582 -p1
 # ieee80211: Add helpers for IBSS DFS handling
-%patch20585 -p1
+%patch20583 -p1
 # ieee80211: Add 802.11h information element parsing
-%patch20586 -p1
+%patch20584 -p1
 # sync with svn.berlios.de
-%patch20587 -p1
+%patch20585 -p1
 # remove linux version compatibility code.
-%patch20588 -p1
+%patch20586 -p1
 # ipw2100: Fix setting txpower failed problem
-%patch20589 -p1
+%patch20587 -p1
 # ipw2200: Fix "iwspy ethx off" causes kernel panic
-%patch20590 -p1
+%patch20588 -p1
 # ipw2200: Fix sw_reset doesn't clear the static essid problem
-%patch20591 -p1
+%patch20589 -p1
 # ipw2200: Fix a variable referenced after kfree() bug
-%patch20592 -p1
+%patch20590 -p1
 # Typo corrections for ieee80211
-%patch20593 -p1
+%patch20591 -p1
 # PCMCIA=m, HOSTAP_CS=y is not a legal configuration
-%patch20594 -p1
+%patch20592 -p1
 # [NETFILTER] nfnetlink_log: add sequence numbers for log events
-%patch20595 -p1
+%patch20593 -p1
 # [SCTP]: correct the number of INIT retransmissions
-%patch20596 -p1
+%patch20594 -p1
 # [SCTP]: heartbeats exceed maximum retransmssion limit
-%patch20597 -p1
+%patch20595 -p1
 # AIRO{,_CS} <-> CRYPTO fixes
-%patch20598 -p1
+%patch20596 -p1
 # drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
-%patch20599 -p1
+%patch20597 -p1
 # drivers/net/wireless/ipw2200: possible cleanups
-%patch20600 -p1
+%patch20598 -p1
 # ieee80211: trivial fix for misplaced ()'s
-%patch20601 -p1
+%patch20599 -p1
 # ipw2100: Add LEAP authentication algorithm support
-%patch20602 -p1
+%patch20600 -p1
 # ipw2100: Make iwconfig txpower setting consistent with user input
-%patch20603 -p1
+%patch20601 -p1
 # ipw2100: Add generic geo information
-%patch20604 -p1
+%patch20602 -p1
 # ipw2100: remove white space and better format the code
-%patch20605 -p1
+%patch20603 -p1
 # increase ipw2100 driver version to git-1.1.4
-%patch20606 -p1
+%patch20604 -p1
 # ipw2200: Fix indirect SRAM/register 8/16-bit write routines
-%patch20607 -p1
+%patch20605 -p1
 # ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
-%patch20608 -p1
+%patch20606 -p1
 # ipw2200: Add LEAP authentication algorithm support
-%patch20609 -p1
+%patch20607 -p1
 # ipw2200: Bluetooth coexistence support
-%patch20610 -p1
+%patch20608 -p1
 # ipw2200: Make LED blinking frequency independent of HZ
-%patch20611 -p1
+%patch20609 -p1
 # ipw2200: add module parameter to enable/disable roaming
-%patch20612 -p1
+%patch20610 -p1
 # ipw2200: Scale firmware loading watchdog with the firmware size
-%patch20613 -p1
+%patch20611 -p1
 # ipw2200: stack reduction
-%patch20614 -p1
+%patch20612 -p1
 # ipw2200: Fix qos_cmd param switch bug
-%patch20615 -p1
+%patch20613 -p1
 # ipw2200: increase ipw2200 driver version
-%patch20616 -p1
+%patch20614 -p1
 # ipw2200: Disable hwcrypto by default
-%patch20617 -p1
+%patch20615 -p1
 # wireless/airo: add IWENCODEEXT and IWAUTH support
-%patch20618 -p1
+%patch20616 -p1
 # wireless/ipw2200: support WE-18 WPA enc_capa
-%patch20619 -p1
+%patch20617 -p1
 # [IPV4] igmp: remove pointless printk
-%patch20620 -p1
+%patch20618 -p1
 # [TCP] H-TCP: Fix accounting
-%patch20621 -p1
+%patch20619 -p1
 # ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt
-%patch20622 -p1
+%patch20620 -p1
 # Add two management functions to ieee80211_rx.c
-%patch20623 -p1
+%patch20621 -p1
 # Clarify help text of SKGE/SK98LIN/SKY2
-%patch20624 -p1
+%patch20622 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
-%patch20625 -p1
+%patch20623 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
-%patch20626 -p1
+%patch20624 -p1
 # [IPV4]: Always set fl.proto in ip_route_newports
-%patch20627 -p1
+%patch20625 -p1
 # [BRIDGE]: Fix device delete race.
-%patch20628 -p1
+%patch20626 -p1
 # [NET]: Do not export inet_bind_bucket_create twice.
-%patch20629 -p1
+%patch20627 -p1
 # [IPV6] tcp_v6_send_synack: release the destination
-%patch20630 -p1
+%patch20628 -p1
 # [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
-%patch20631 -p1
+%patch20629 -p1
 # lp486e: remove SLOW_DOWN_IO
-%patch20632 -p1
+%patch20630 -p1
 # ipw2200: fix ->eeprom[EEPROM_VERSION] check
-%patch20633 -p1
+%patch20631 -p1
 # DocBook: fix some kernel-doc comments in net/sunrpc
-%patch20634 -p1
+%patch20632 -p1
 # SUNRPC: Fix a lock recursion in the auth_gss downcall
-%patch20635 -p1
+%patch20633 -p1
 # SUNRPC: Move upcall out of auth->au_ops->crcreate()
-%patch20636 -p1
+%patch20634 -p1
 # [NET] snap: needs hardware checksum fix
-%patch20637 -p1
+%patch20635 -p1
 # [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
-%patch20638 -p1
+%patch20636 -p1
 # [SCTP]: Fix 'fast retransmit' to send a TSN only once.
-%patch20639 -p1
+%patch20637 -p1
 # [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
-%patch20640 -p1
+%patch20638 -p1
 # [IPV6]: Fix illegal dst locking in softirq context.
-%patch20641 -p1
+%patch20639 -p1
 # [IPV4]: Remove suprious use of goto out: in icmp_reply
-%patch20642 -p1
+%patch20640 -p1
 # [TG3]: Flush tg3_reset_task()
-%patch20643 -p1
+%patch20641 -p1
 # [TG3]: Update driver version and release date.
-%patch20644 -p1
+%patch20642 -p1
 # [IPV4]: Use RCU locking in fib_rules.
-%patch20645 -p1
+%patch20643 -p1
 # [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
-%patch20646 -p1
+%patch20644 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3770,11 +3764,9 @@
 - [NET]: Fix some whitespace issues in af_packet.c
 - [SUNGEM]: Make PM of PHYs more reliable (#2)
 - [NET]: Fix skb fclone error path handling.
-- wireless: add prism54usb driver
 - [BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
 - [AF_KEY]: no message type set
 - [IPV6] MLDv2: fix change records when transitioning to/from inactive
-- prism54usb: fix build break in islusb_init.c
 - sundance: Really read addr 0
 - bonding: fix ->get_settings error checking
 - acenic: fix checking of read_eeprom_byte() return values


--- 3646-wireless-add-prism54usb-driver.txt DELETED ---


--- 3663-prism54usb-fix-build-break-in-islusb_init.c.txt DELETED ---