Skip to content

Commit

Permalink
[PATCH] sk98lin: fix checksumming code
Browse files Browse the repository at this point in the history
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: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
shemminger@osdl.org authored and Jeff Garzik committed Dec 1, 2005
1 parent a174fd8 commit 596f86a
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 1,007 deletions.
5 changes: 2 additions & 3 deletions drivers/net/sk98lin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ sk98lin-objs := \
sktimer.o \
skvpd.o \
skxmac2.o \
skproc.o \
skcsum.o
skproc.o

# DBGDEF = \
# -DDEBUG
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/sk98lin/h/skdrv2nd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading

0 comments on commit 596f86a

Please sign in to comment.