crc-itu-t - rt2x00 should use crc-itu-t

PATCH In review Ivo van Doorn 1 participant 1 message Aug 8, 2006

Subsystems (3)

Networking Network drivers Networking drivers (wireless)

lore

Share & tools

lore

Ivo van Doorn

author

2006-08-08 14:22 UTC #0 lore raw

PATCH 2/2 crc-itu-t - rt2x00 should use crc-itu-t

Now crc-itu-t is available rt2x00 should use that implementation instead of its own private version.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/rt2x00/Kconfig +2 -0

diff -rNU3 wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/Kconfig wireless-dev-rt2x00-crc/drivers/net/wireless/d80211/rt2x00/Kconfig
@@ -56,6 +56,7 @@
 config RT61PCI
 	tristate "Ralink rt61 pci/pcmcia support"
 	depends on RT2X00 && FW_LOADER && PCI
+	select CRC_ITU_T
 	---help---
 	This is an experimental driver for the Ralink rt61 wireless chip.

@@ -93,6 +94,7 @@
 config RT73USB
 	tristate "Ralink rt73 usb support"
 	depends on RT2X00 && FW_LOADER && USB
+	select CRC_ITU_T
 	---help---
 	This is an experimental driver for the Ralink rt73 wireless chip.

drivers/net/wireless/d80211/rt2x00/rt2x00crc.h +0 ~~-82~~

82 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/rt61pci.c +3 -3

diff -rNU3 wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev-rt2x00-crc/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -37,6 +37,7 @@
 #include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/ethtool.h>
+#include <linux/crc-itu-t.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -58,7 +59,6 @@
 
 #include "rt2x00.h"
 #include "rt2x00pci.h"
-#include "rt2x00crc.h"
 #include "rt61pci.h"
 
 /*

@@ -1351,8 +1351,8 @@
 	 * and set those 2 bytes to 0 when calculating CRC.
 	 */
 	reg = 0;
-	crc = rt2x00crc(0, fw->data, fw->size - 2);
-	crc = rt2x00crc(crc, (u8*)&reg, 2);
+	crc = crc_itu_t(0, fw->data, fw->size - 2);
+	crc = crc_itu_t(crc, (u8*)&reg, 2);
 
 	if (crc != (fw->data[fw->size - 2] << 8 | fw->data[fw->size - 1])) {
 		ERROR("Firmware CRC error.\n");

drivers/net/wireless/d80211/rt2x00/rt73usb.c +3 -3

diff -rNU3 wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt73usb.c wireless-dev-rt2x00-crc/drivers/net/wireless/d80211/rt2x00/rt73usb.c
@@ -36,6 +36,7 @@
 #include <linux/wireless.h>
 #include <linux/firmware.h>
 #include <linux/ethtool.h>
+#include <linux/crc-itu-t.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -51,7 +52,6 @@
 
 #include "rt2x00.h"
 #include "rt2x00usb.h"
-#include "rt2x00crc.h"
 #include "rt73usb.h"
 
 /*

@@ -1062,8 +1062,8 @@
 	 * and set those 2 bytes to 0 when calculating CRC.
 	 */
 	reg = 0;
-	crc = rt2x00crc(0, fw->data, fw->size - 2);
-	crc = rt2x00crc(crc, (u8*)&reg, 2);
+	crc = crc_itu_t(0, fw->data, fw->size - 2);
+	crc = crc_itu_t(crc, (u8*)&reg, 2);
 
 	if (crc != (fw->data[fw->size - 2] << 8 | fw->data[fw->size - 1])) {
 		ERROR("Firmware CRC error.\n");