diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-05 17:10:39 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-06-05 17:10:39 +0000 |
| commit | f4fb68ce2cd61529703f4244c3126e47ce0cfec4 (patch) | |
| tree | 36496e13270435c09e3f8c1880929d94bd26733a /target/linux/storm/patches/1004-gmac-enable-napi.patch | |
| parent | 51b1102e9862d66d813697ebd63e083b002b264d (diff) | |
* refresh storm patches
* disable BX in uClibc config, add ethernet and watchdog support -- thanks to Zilvinas Valinskas
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/storm/patches/1004-gmac-enable-napi.patch')
| -rw-r--r-- | target/linux/storm/patches/1004-gmac-enable-napi.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/storm/patches/1004-gmac-enable-napi.patch b/target/linux/storm/patches/1004-gmac-enable-napi.patch index 76edc39cd1..ea374c41c9 100644 --- a/target/linux/storm/patches/1004-gmac-enable-napi.patch +++ b/target/linux/storm/patches/1004-gmac-enable-napi.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c -=================================================================== ---- linux-2.6.23.17.orig/drivers/net/sl351x_gmac.c -+++ linux-2.6.23.17/drivers/net/sl351x_gmac.c +--- a/drivers/net/sl351x_gmac.c ++++ b/drivers/net/sl351x_gmac.c @@ -68,9 +68,11 @@ #include <linux/ip.h> #endif @@ -15,7 +13,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c #endif #define GMAX_TX_INTR_DISABLED 1 #define DO_HW_CHKSUM 1 -@@ -124,12 +126,17 @@ static char _debug_prefetch_buf[_DEBUG_P +@@ -124,12 +126,17 @@ *************************************************************/ static int gmac_initialized = 0; TOE_INFO_T toe_private_data; @@ -35,7 +33,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c #undef CONFIG_SL351x_RXTOE extern NAT_CFG_T nat_cfg; -@@ -2443,7 +2450,8 @@ static irqreturn_t toe_gmac_interrupt (i +@@ -2443,7 +2450,8 @@ toe = (TOE_INFO_T *)&toe_private_data; // handle NAPI #ifdef CONFIG_SL_NAPI @@ -45,7 +43,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c { /* disable GMAC interrupt */ //toe_gmac_disable_interrupt(tp->irq); -@@ -2530,7 +2538,7 @@ if (storlink_ctl.pauseoff == 1) +@@ -2530,7 +2538,7 @@ { if (likely(netif_rx_schedule_prep(dev))) { @@ -54,7 +52,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c // disable GMAC-0 rx interrupt // class-Q & TOE-Q are implemented in future //data32 = readl(TOE_GLOBAL_BASE + GLOBAL_INTERRUPT_ENABLE_1_REG); -@@ -2563,7 +2571,7 @@ if (storlink_ctl.pauseoff == 1) +@@ -2563,7 +2571,7 @@ { if (likely(netif_rx_schedule_prep(dev))) { @@ -63,7 +61,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c // disable GMAC-0 rx interrupt // class-Q & TOE-Q are implemented in future //data32 = readl(TOE_GLOBAL_BASE + GLOBAL_INTERRUPT_ENABLE_1_REG); -@@ -4217,7 +4225,7 @@ static int gmac_rx_poll(struct net_devic +@@ -4217,7 +4225,7 @@ GMAC_INFO_T *tp = (GMAC_INFO_T *)dev->priv; unsigned int status4; volatile DMA_RWPTR_T fq_rwptr; @@ -72,7 +70,7 @@ Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c //unsigned long rx_old_bytes; struct net_device_stats *isPtr = (struct net_device_stats *)&tp->ifStatics; //unsigned long long rx_time; -@@ -4479,7 +4487,7 @@ static int gmac_rx_poll(struct net_devic +@@ -4479,7 +4487,7 @@ if (rwptr.bits.rptr == rwptr.bits.wptr) { |