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

Commit 596f86a8 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] sk98lin: fix checksumming code 



Remove code from sk98lin that does it's own checksum validation.
This code is incorrect when dealing with nested protocols like
VLAN's, and it is better to use regular receive code path to
handle hardware checksum.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a174fd88

drivers/net/sk98lin/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ sk98lin-objs := \ 
		sktimer.o	\

		skvpd.o		\

		skxmac2.o	\

		skproc.o	\

		skcsum.o

		skproc.o



# DBGDEF =  \

# -DDEBUG
@@ -77,7 +76,7 @@ endif 
# SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources

# SK_DBGCAT_DRV_EVENT           0x08000000      driver events



EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)

EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)



clean:

	rm -f core *.o *.a *.s

drivers/net/sk98lin/h/skdrv2nd.h

+0 −4
Original line number Diff line number Diff line
@@ -425,10 +425,6 @@ struct s_AC { 
	TX_PORT		TxPort[SK_MAX_MACS][2];

	RX_PORT		RxPort[SK_MAX_MACS];



	unsigned int	CsOfs1;		/* for checksum calculation */

	unsigned int	CsOfs2;		/* for checksum calculation */

	SK_U32		CsOfs;		/* for checksum calculation */



	SK_BOOL		CheckQueue;	/* check event queue soon */

	SK_TIMER        DrvCleanupTimer;/* to check for pending descriptors */

	DIM_INFO        DynIrqModInfo;  /* all data related to DIM */