Skip to contentSkip to conversation

rt2x00 should use generic crc-itu-t

PATCH RESEND In review Ivo van Doorn 1 participant 1 message Jan 3, 2007

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Ivo van Doorn

author
#0 lore raw

PATCH RESEND 4/4 rt2x00 should use generic crc-itu-t

This patch removes the crc-itu-t files from rt2x00 and makes sure rt2x00 will use the generic crc-itu-t implementation inside the lib folder.

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

---

drivers/net/wireless/d80211/rt2x00/Kconfig +0 -8
diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/Kconfig wireless-dev_crc/drivers/net/wireless/d80211/rt2x00/Kconfig
@@ -81,11 +81,3 @@
 	depends on RT73USB
 	---help---
 	Enable debugging output.
-
-config CRC_ITU_T
-	tristate "CRC ITU-T V.41 functions"
-	help
-	  This option is provided for the case where no in-kernel-tree
-	  modules require CRC ITU-T V.41 functions, but a module built outside
-	  the kernel tree does. Such modules that use library CRC ITU-T V.41
-	  functions require M here.
drivers/net/wireless/d80211/rt2x00/Makefile +0 -1
diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/Makefile wireless-dev_crc/drivers/net/wireless/d80211/rt2x00/Makefile
@@ -3,4 +3,3 @@
 obj-$(CONFIG_RT61PCI)		+= rt61pci.o
 obj-$(CONFIG_RT2500USB)		+= rt2500usb.o
 obj-$(CONFIG_RT73USB)		+= rt73usb.o
-obj-$(CONFIG_CRC_ITU_T)		+= crc-itu-t.o
drivers/net/wireless/d80211/rt2x00/crc-itu-t.c +0 -66

66 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/crc-itu-t.h +0 -27
diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/crc-itu-t.h wireless-dev_crc/drivers/net/wireless/d80211/rt2x00/crc-itu-t.h
@@ -1,27 +0,0 @@
-/*
- *	crc-itu-t.h - CRC ITU-T V.41 routine
- *
- * Implements the standard CRC ITU-T V.41:
- *   Width 16
- *   Poly  0x1021 (x^16 + x^12 + x^15 + 1)
- *   Init  0
- *
- * This source code is licensed under the GNU General Public License,
- * Version 2. See the file COPYING for more details.
- */
-
-#ifndef CRC_ITU_T_H
-#define CRC_ITU_T_H
-
-#include <linux/types.h>
-
-extern u16 const crc_itu_t_table[256];
-
-extern u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len);
-
-static inline u16 crc_itu_t_byte(u16 crc, const u8 data)
-{
-	return (crc << 8) ^ crc_itu_t_table[((crc >> 8) ^ data) & 0xff];
-}
-
-#endif /* CRC_ITU_T_H */
drivers/net/wireless/d80211/rt2x00/rt61pci.c +1 -1
diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev_crc/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -37,6 +37,7 @@
 #include <linux/wireless.h>
 #include <linux/eeprom_93cx6.h>
 #include <linux/firmware.h>
+#include <linux/crc-itu-t.h>
 
 #include <net/iw_handler.h>
 #include <net/d80211.h>

@@ -55,7 +56,6 @@
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt61pci.h"
-#include "crc-itu-t.h"
 
 /*
  * Register access.
drivers/net/wireless/d80211/rt2x00/rt73usb.c +1 -1
diff -rNU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt73usb.c wireless-dev_crc/drivers/net/wireless/d80211/rt2x00/rt73usb.c
@@ -35,6 +35,7 @@
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
 #include <linux/firmware.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 "rt73usb.h"
-#include "crc-itu-t.h"
 
 /*
  * Register access.