leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ethernet: Use existing define with polynomial

Browse Source 
Do not define again the polynomial but use header with existing define.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Krzysztof Kozlowski
2018-07-17 18:05:39 +02:00
committed by Herbert Xu
parent f7aee87822
commit 5d258b48ef
8 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
View File

@@ -119,6 +119,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/crc32poly.h>
#include "xgbe.h" #include "xgbe.h"
#include "xgbe-common.h" #include "xgbe-common.h"
@@ -887,7 +888,6 @@ static int xgbe_disable_rx_vlan_filtering(struct xgbe_prv_data *pdata)
static u32 xgbe_vid_crc32_le(__le16 vid_le) static u32 xgbe_vid_crc32_le(__le16 vid_le)
{ {
u32 poly = 0xedb88320; /* CRCPOLY_LE */
u32 crc = ~0; u32 crc = ~0;
u32 temp = 0; u32 temp = 0;
unsigned char *data = (unsigned char *)&vid_le; unsigned char *data = (unsigned char *)&vid_le;
@@ -904,7 +904,7 @@ static u32 xgbe_vid_crc32_le(__le16 vid_le)
data_byte >>= 1; data_byte >>= 1;
if (temp) if (temp)
crc ^= poly; crc ^= CRC32_POLY_LE;
} }
return crc; return crc;

8
drivers/net/ethernet/apple/bmac.c
View File

@@ -19,6 +19,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/crc32poly.h>
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/slab.h> #include <linux/slab.h>
@@ -37,11 +38,6 @@
#define trunc_page(x) ((void *)(((unsigned long)(x)) & ~((unsigned long)(PAGE_SIZE - 1)))) #define trunc_page(x) ((void *)(((unsigned long)(x)) & ~((unsigned long)(PAGE_SIZE - 1))))
#define round_page(x) trunc_page(((unsigned long)(x)) + ((unsigned long)(PAGE_SIZE - 1))) #define round_page(x) trunc_page(((unsigned long)(x)) + ((unsigned long)(PAGE_SIZE - 1)))
/*
* CRC polynomial - used in working out multicast filter bits.
*/
#define ENET_CRCPOLY 0x04c11db7
/* switch to use multicast code lifted from sunhme driver */ /* switch to use multicast code lifted from sunhme driver */
#define SUNHME_MULTICAST #define SUNHME_MULTICAST
@@ -838,7 +834,7 @@ crc416(unsigned int curval, unsigned short nxtval)
next = next >> 1; next = next >> 1;
/* do the XOR */ /* do the XOR */
if (high_crc_set ^ low_data_set) cur = cur ^ ENET_CRCPOLY; if (high_crc_set ^ low_data_set) cur = cur ^ CRC32_POLY_BE;
} }
return cur; return cur;
} }

3
drivers/net/ethernet/broadcom/tg3.c
View File

@@ -50,6 +50,7 @@
#include <linux/ssb/ssb_driver_gige.h> #include <linux/ssb/ssb_driver_gige.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h> #include <linux/hwmon-sysfs.h>
#include <linux/crc32poly.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <net/ip.h> #include <net/ip.h>
@@ -9707,7 +9708,7 @@ static inline u32 calc_crc(unsigned char *buf, int len)
reg >>= 1; reg >>= 1;
if (tmp) if (tmp)
reg ^= 0xedb88320; reg ^= CRC32_POLY_LE;
} }
} }

4
drivers/net/ethernet/freescale/fec_main.c
View File

@@ -48,6 +48,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/crc32poly.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mdio.h> #include <linux/mdio.h>
#include <linux/phy.h> #include <linux/phy.h>
@@ -2949,7 +2950,6 @@ fec_enet_close(struct net_device *ndev)
*/ */
#define FEC_HASH_BITS 6 /* #bits in hash */ #define FEC_HASH_BITS 6 /* #bits in hash */
#define CRC32_POLY 0xEDB88320
static void set_multicast_list(struct net_device *ndev) static void set_multicast_list(struct net_device *ndev)
{ {
@@ -2989,7 +2989,7 @@ static void set_multicast_list(struct net_device *ndev)
data = ha->addr[i]; data = ha->addr[i];
for (bit = 0; bit < 8; bit++, data >>= 1) { for (bit = 0; bit < 8; bit++, data >>= 1) {
crc = (crc >> 1) ^ crc = (crc >> 1) ^
(((crc ^ data) & 1) ? CRC32_POLY : 0); (((crc ^ data) & 1) ? CRC32_POLY_LE : 0);
} }
} }

3
drivers/net/ethernet/freescale/fs_enet/fec.h
View File

@@ -2,9 +2,6 @@
#ifndef FS_ENET_FEC_H #ifndef FS_ENET_FEC_H
#define FS_ENET_FEC_H #define FS_ENET_FEC_H
/* CRC polynomium used by the FEC for the multicast group filtering */
#define FEC_CRC_POLY 0x04C11DB7
#define FEC_MAX_MULTICAST_ADDRS 64 #define FEC_MAX_MULTICAST_ADDRS 64
/* Interrupt events/masks. /* Interrupt events/masks.

3
drivers/net/ethernet/freescale/fs_enet/mac-fec.c
View File

@@ -18,6 +18,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/crc32poly.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -187,7 +188,7 @@ static void set_multicast_one(struct net_device *dev, const u8 *mac)
msb = crc >> 31; msb = crc >> 31;
crc <<= 1; crc <<= 1;
if (msb ^ (byte & 0x1)) if (msb ^ (byte & 0x1))
crc ^= FEC_CRC_POLY; crc ^= CRC32_POLY_BE;
byte >>= 1; byte >>= 1;
} }
} }

3
drivers/net/ethernet/micrel/ks8851_mll.c
View File

@@ -30,6 +30,7 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/cache.h> #include <linux/cache.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/crc32poly.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/delay.h> #include <linux/delay.h>
@@ -1078,7 +1079,7 @@ static void ks_stop_rx(struct ks_net *ks)
} /* ks_stop_rx */ } /* ks_stop_rx */
static unsigned long const ethernet_polynomial = 0x04c11db7U; static unsigned long const ethernet_polynomial = CRC32_POLY_BE;
static unsigned long ether_gen_crc(int length, u8 *data) static unsigned long ether_gen_crc(int length, u8 *data)
{ {

4
drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c
View File

@@ -20,6 +20,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/crc32poly.h>
#include <linux/dcbnl.h> #include <linux/dcbnl.h>
#include "dwc-xlgmac.h" #include "dwc-xlgmac.h"
@@ -193,7 +194,6 @@ static u32 xlgmac_vid_crc32_le(__le16 vid_le)
{ {
unsigned char *data = (unsigned char *)&vid_le; unsigned char *data = (unsigned char *)&vid_le;
unsigned char data_byte = 0; unsigned char data_byte = 0;
u32 poly = 0xedb88320;
u32 crc = ~0; u32 crc = ~0;
u32 temp = 0; u32 temp = 0;
int i, bits; int i, bits;
@@ -208,7 +208,7 @@ static u32 xlgmac_vid_crc32_le(__le16 vid_le)
data_byte >>= 1; data_byte >>= 1;
if (temp) if (temp)
crc ^= poly; crc ^= CRC32_POLY_LE;
} }
return crc; return crc;