Jeff Garzik wrote:
Andi Kleen wrote:
Sorry to nitpick again and not catching it earlier, but are you sure
it works this way? Normally the options in Kconfig are not prefixed
with CONFIG_*
So
config UNALIGNED_EXPENSIVE
would be likely correct
Yes, that looks right to me. I'm still learning the whole 2.6 Kconfig thing
indeed.
For my part, I will apply the patch to drivers/net/tg3.c, which is fine,
and will let the arch/ia64/Kconfig patch go through normal channels
(since ia64 seems to be flowing these days).
Jeff
Is this OK ?
--- linux/drivers/net/tg3.c 2003-11-10 18:28:10.000000000 -0600
+++ patch/drivers/net/tg3.c 2003-11-10 18:58:35.000000000 -0600
@@ -2257,7 +2257,11 @@
len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - 4; /*
omit crc */
- if (len > RX_COPY_THRESHOLD) {
+ if (len > RX_COPY_THRESHOLD
+#if defined(CONFIG_UNALIGNED_EXPENSIVE)
+ && tp->rx_offset == 2
+#endif
+ ) {
int skb_size;
skb_size = tg3_alloc_rx_skb(tp, opaque_key,
--- linux/arch/ia64/Kconfig 2003-10-25 13:44:46.000000000 -0500
+++ patch/arch/ia64/Kconfig 2003-11-12 09:31:14.000000000 -0600
@@ -468,6 +468,10 @@
agent" (/sbin/hotplug) to load modules and set up software needed
to use devices as you hotplug them.
+config UNALIGNED_EXPENSIVE
+ depends on IA64
+ default y
+
source "drivers/pci/hotplug/Kconfig"
source "drivers/pcmcia/Kconfig"
--
John Partridge
Silicon Graphics Inc
Tel: 651-683-3428
Vnet: 233-3428
E-Mail: johnip@xxxxxxx
|