Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] sky2: fix jumbo packet support
+16
-3
+16
-3
drivers/net/sky2.c
+16
-3
drivers/net/sky2.c
···
979
979
struct sky2_hw *hw = sky2->hw;
980
980
unsigned rxq = rxqaddr[sky2->port];
981
981
int i;
982
+
unsigned thresh;
982
983
983
984
sky2->rx_put = sky2->rx_next = 0;
984
985
sky2_qset(hw, rxq);
···
1004
1003
sky2_rx_add(sky2, re->mapaddr);
1005
1004
}
1006
1005
1007
-
/* Truncate oversize frames */
1008
-
sky2_write16(hw, SK_REG(sky2->port, RX_GMF_TR_THR), sky2->rx_bufsize - 8);
1009
-
sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_ON);
1006
+
1007
+
/*
1008
+
* The receiver hangs if it receives frames larger than the
1009
+
* packet buffer. As a workaround, truncate oversize frames, but
1010
+
* the register is limited to 9 bits, so if you do frames > 2052
1011
+
* you better get the MTU right!
1012
+
*/
1013
+
thresh = (sky2->rx_bufsize - 8) / sizeof(u32);
1014
+
if (thresh > 0x1ff)
1015
+
sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_OFF);
1016
+
else {
1017
+
sky2_write16(hw, SK_REG(sky2->port, RX_GMF_TR_THR), thresh);
1018
+
sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_ON);
1019
+
}
1020
+
1010
1021
1011
1022
/* Tell chip about available buffers */
1012
1023
sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put);