Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe46f58f authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

e1000e: use either_crc_le() rather than re-write it 



For the 82579 jumbo frame workaround, there is no need to re-write the CRC
calculation functionality already found in the kernel's ether_crc_le().

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0dc4f12

drivers/net/e1000e/e1000.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/netdevice.h>

#include <linux/pci.h>

#include <linux/pci-aspm.h>

#include <linux/crc32.h>



#include "hw.h"

drivers/net/e1000e/ich8lan.c

+1 −18
Original line number Diff line number Diff line
@@ -1395,22 +1395,6 @@ void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw) 
	}

}



static u32 e1000_calc_rx_da_crc(u8 mac[])

{

	u32 poly = 0xEDB88320;	/* Polynomial for 802.3 CRC calculation */

	u32 i, j, mask, crc;



	crc = 0xffffffff;

	for (i = 0; i < 6; i++) {

		crc = crc ^ mac[i];

		for (j = 8; j > 0; j--) {

			mask = (crc & 1) * (-1);

			crc = (crc >> 1) ^ (poly & mask);

		}

	}

	return ~crc;

}



/**

 *  e1000_lv_jumbo_workaround_ich8lan - required for jumbo frame operation

 *  with 82579 PHY
@@ -1453,8 +1437,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable) 
			mac_addr[4] = (addr_high & 0xFF);

			mac_addr[5] = ((addr_high >> 8) & 0xFF);



			ew32(PCH_RAICC(i),

					e1000_calc_rx_da_crc(mac_addr));

			ew32(PCH_RAICC(i), ~ether_crc_le(ETH_ALEN, mac_addr));

		}



		/* Write Rx addresses to the PHY */