[PATCH] remove 8139too ring size option.

On Wed, 31 Mar 2004 15:05:16 -0500
Jeff Garzik <jgarzik@pobox.com> wrote:

> I really should remove the ability to configure 8139_RXBUF_IDX=3.

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index baae39b6d99c8f34f7e5a72b53173953fb51096f..1cbb1c4eb2ac34ecc6486caa9e97d8f16ff5cbc0 100644 (file)
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -167,8 +167,12 @@ static int multicast_filter_limit = 32;
 /* bitmapped message enable number */
 static int debug = -1;
 
-/* Ring size is now a config option */
-#define RX_BUF_LEN     (8192 << CONFIG_8139_RXBUF_IDX)
+/*
+ * Receive ring size 
+ * Warning: 64K ring has hardware issues and may lock up.
+ */
+#define RX_BUF_IDX     2       /* 32K ring */
+#define RX_BUF_LEN     (8192 << RX_BUF_IDX)
 #define RX_BUF_PAD     16
 #define RX_BUF_WRAP_PAD 2048 /* spare padding to handle lack of packet wrap */
 
@@ -692,22 +696,22 @@ static const u16 rtl8139_norx_intr_mask =
        PCIErr | PCSTimeout | RxUnderrun |
        TxErr | TxOK | RxErr ;
 
-#if CONFIG_8139_RXBUF_IDX == 0
+#if RX_BUF_IDX == 0
 static const unsigned int rtl8139_rx_config =
        RxCfgRcv8K | RxNoWrap |
        (RX_FIFO_THRESH << RxCfgFIFOShift) |
        (RX_DMA_BURST << RxCfgDMAShift);
-#elif CONFIG_8139_RXBUF_IDX == 1
+#elif RX_BUF_IDX == 1
 static const unsigned int rtl8139_rx_config =
        RxCfgRcv16K | RxNoWrap |
        (RX_FIFO_THRESH << RxCfgFIFOShift) |
        (RX_DMA_BURST << RxCfgDMAShift);
-#elif CONFIG_8139_RXBUF_IDX == 2
+#elif RX_BUF_IDX == 2
 static const unsigned int rtl8139_rx_config =
        RxCfgRcv32K | RxNoWrap |
        (RX_FIFO_THRESH << RxCfgFIFOShift) |
        (RX_DMA_BURST << RxCfgDMAShift);
-#elif CONFIG_8139_RXBUF_IDX == 3
+#elif RX_BUF_IDX == 3
 static const unsigned int rtl8139_rx_config =
        RxCfgRcv64K |
        (RX_FIFO_THRESH << RxCfgFIFOShift) |
@@ -1911,7 +1915,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,
 #endif
 }
 
-#if CONFIG_8139_RXBUF_IDX == 3
+#if RX_BUF_IDX == 3
 static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
                                 u32 offset, unsigned int size)
 {
@@ -1997,7 +2001,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
                if (likely(skb)) {
                        skb->dev = dev;
                        skb_reserve (skb, 2);   /* 16 byte align the IP fields. */
-#if CONFIG_8139_RXBUF_IDX == 3
+#if RX_BUF_IDX == 3
                        wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
 #else
                        eth_copy_and_sum (skb, &rx_ring[ring_offset + 4], pkt_size, 0);

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4e22f5cd48eb58603dad7e35861efbb0d0d7ed8..6013aecab809f8c45ce2793b4cf6749f1fa9e1c8 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1597,24 +1597,6 @@ config 8139_OLD_RX_RESET
          experience problems, you can enable this option to restore the
          old RX-reset behavior.  If unsure, say N.
 
-config 8139_RXBUF_IDX
-       int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)"
-       depends on 8139TOO
-       range 0 3
-       default 1 if EMBEDDED || SH_DREAMCAST
-       default 2
-       help
-          The 8139too driver has a fixed area of memory for receiving data.
-          The default value is adequate for most systems. The 64KB 
-          ring size has hardware issues that may cause problems.
-          Values:
-               0  => 8 KB 
-               1  => 16 KB embedded systems
-               2  => 32 KB default for most systems
-               3  => 64 KB 
-          If unsure, use the default 2.
-
-
 config SIS900
        tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
        depends on NET_PCI && PCI