Commit c1dbc2e4 authored by Jeff Garzik's avatar Jeff Garzik

Update 8139too net driver to make new rx-reset method the default

parent 168fbe85
...@@ -1784,7 +1784,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev, ...@@ -1784,7 +1784,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,
struct rtl8139_private *tp, void *ioaddr) struct rtl8139_private *tp, void *ioaddr)
{ {
u8 tmp8; u8 tmp8;
#ifndef CONFIG_8139_NEW_RX_RESET #ifdef CONFIG_8139_OLD_RX_RESET
int tmp_work; int tmp_work;
#endif #endif
...@@ -1807,7 +1807,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev, ...@@ -1807,7 +1807,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,
tp->xstats.rx_lost_in_ring++; tp->xstats.rx_lost_in_ring++;
} }
#ifdef CONFIG_8139_NEW_RX_RESET #ifndef CONFIG_8139_OLD_RX_RESET
tmp8 = RTL_R8 (ChipCmd); tmp8 = RTL_R8 (ChipCmd);
RTL_W8 (ChipCmd, tmp8 & ~CmdRxEnb); RTL_W8 (ChipCmd, tmp8 & ~CmdRxEnb);
RTL_W8 (ChipCmd, tmp8); RTL_W8 (ChipCmd, tmp8);
......
...@@ -176,7 +176,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then ...@@ -176,7 +176,7 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
dep_mbool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO $CONFIG_8139TOO dep_mbool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO $CONFIG_8139TOO
dep_mbool ' Support for automatic channel equalization (EXPERIMENTAL)' CONFIG_8139TOO_TUNE_TWISTER $CONFIG_8139TOO $CONFIG_EXPERIMENTAL dep_mbool ' Support for automatic channel equalization (EXPERIMENTAL)' CONFIG_8139TOO_TUNE_TWISTER $CONFIG_8139TOO $CONFIG_EXPERIMENTAL
dep_mbool ' Support for older RTL-8129/8130 boards' CONFIG_8139TOO_8129 $CONFIG_8139TOO dep_mbool ' Support for older RTL-8129/8130 boards' CONFIG_8139TOO_8129 $CONFIG_8139TOO
dep_mbool ' Experiment for better RX reset (EXPERIMENTAL)' CONFIG_8139_NEW_RX_RESET $CONFIG_8139TOO $CONFIG_EXPERIMENTAL dep_mbool ' Use older RX-reset method' CONFIG_8139_NEW_RX_RESET $CONFIG_8139TOO
dep_tristate ' SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 $CONFIG_PCI dep_tristate ' SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900 $CONFIG_PCI
dep_tristate ' SMC EtherPower II' CONFIG_EPIC100 $CONFIG_PCI dep_tristate ' SMC EtherPower II' CONFIG_EPIC100 $CONFIG_PCI
dep_tristate ' Sundance Alta support' CONFIG_SUNDANCE $CONFIG_PCI dep_tristate ' Sundance Alta support' CONFIG_SUNDANCE $CONFIG_PCI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment