[kernel] r14180 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Aug 23 21:27:45 2009
New Revision: 14180

Log:
rt{2860,2870,3070}sta: Use existing CCITT CRC implementation on firmware rather than adding an equivalent variant of ITU-T CRC

Deleted:
   dists/trunk/linux-2.6/debian/patches/features/all/lib-crcitut-bit-reversed.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Aug 23 15:56:07 2009	(r14179)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Aug 23 21:27:45 2009	(r14180)
@@ -64,6 +64,8 @@
   * qla1280: Release spinlock when requesting firmware (closes: #543244)
   * r128: Add test for initialisation to all ioctls that require it
     (closes: #541630)
+  * rt{2860,2870,3070}sta: Use existing CCITT CRC implementation on
+    firmware rather than adding an equivalent variant of ITU-T CRC
 
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these

Modified: dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch	Sun Aug 23 15:56:07 2009	(r14179)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch	Sun Aug 23 21:27:45 2009	(r14180)
@@ -20,7 +20,7 @@
  	tristate "Ralink 2860 wireless support"
 -	depends on BROKEN
  	depends on PCI && X86 && WLAN_80211
-+	select CRC_ITU_T
++	select CRC_CCITT
 +	select FW_LOADER
  	---help---
  	  This is an experimental driver for the Ralink 2860 wireless chip.
@@ -45,7 +45,7 @@
 -#include "../../rt3070/firmware.h"
 -#endif
 +#include <linux/firmware.h>
-+#include <linux/crc-itu-t.h>
++#include <linux/crc-ccitt.h>
  
  UCHAR    BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
  ULONG    BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
@@ -135,7 +135,7 @@
  #endif
  
  
-@@ -3314,45 +3255,67 @@ NDIS_STATUS NICLoadFirmware(
+@@ -3314,45 +3255,65 @@ NDIS_STATUS NICLoadFirmware(
  	IN PRTMP_ADAPTER pAd)
  {
  	NDIS_STATUS		Status = NDIS_STATUS_SUCCESS;
@@ -217,10 +217,8 @@
 +	}
 +
 +	/* is the internal CRC correct? */
-+	if (crc_itu_t_bitreversed(0xffff, fw->data, fw->size - 2) !=
-+	    (bitrev8(fw->data[fw->size - 2]) << 8 |
-+	     bitrev8(fw->data[fw->size - 1]))) {
-+		/* CRC fail */
++	if (crc_ccitt(0xffff, fw->data, fw->size - 2) !=
++	    (fw->data[fw->size - 2] | (fw->data[fw->size - 1] << 8))) {
 +		dev_err(dev, "firmware file %s failed internal CRC\n", name);
 +		goto fail;
 +	}
@@ -256,7 +254,7 @@
  	tristate "Ralink 2870 wireless support"
 -	depends on BROKEN
  	depends on USB && X86 && WLAN_80211
-+	select CRC_ITU_T
++	select CRC_CCITT
 +	select FW_LOADER
  	---help---
  	  This is an experimental driver for the Ralink 2870 wireless chip.
@@ -270,7 +268,7 @@
  	tristate "Ralink 3070 wireless support"
 -	depends on BROKEN
  	depends on USB && X86 && WLAN_80211
-+	select CRC_ITU_T
++	select CRC_CCITT
 +	select FW_LOADER
  	---help---
  	  This is an experimental driver for the Ralink 3070 wireless chip.

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Aug 23 15:56:07 2009	(r14179)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Aug 23 21:27:45 2009	(r14180)
@@ -12,8 +12,6 @@
 # Enable this for next rc
 #+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
 + features/all/drivers-net-cxgb3-request_firmware.patch
-# rt2860sta and rt2870sta need ITU-T CRC on bit-reversed data
-+ features/all/lib-crcitut-bit-reversed.patch
 + features/all/drivers-staging-rt28x0sta-request_firmware.patch
 + features/all/export-unionfs-symbols.patch
 + features/all/sound-pci-cs46xx-request_firmware.patch