mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[storm] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11211 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
Index: linux-2.6.23.16/drivers/net/sl351x_gmac.c
|
||||
Index: linux-2.6.23.17/drivers/net/sl351x_gmac.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/net/sl351x_gmac.c 2008-03-15 16:59:23.361457295 +0200
|
||||
+++ linux-2.6.23.16/drivers/net/sl351x_gmac.c 2008-03-15 17:00:32.365389612 +0200
|
||||
--- linux-2.6.23.17.orig/drivers/net/sl351x_gmac.c
|
||||
+++ linux-2.6.23.17/drivers/net/sl351x_gmac.c
|
||||
@@ -68,9 +68,11 @@
|
||||
#include <linux/ip.h>
|
||||
#endif
|
||||
@@ -15,7 +15,7 @@ Index: linux-2.6.23.16/drivers/net/sl351x_gmac.c
|
||||
#endif
|
||||
#define GMAX_TX_INTR_DISABLED 1
|
||||
#define DO_HW_CHKSUM 1
|
||||
@@ -124,12 +126,17 @@
|
||||
@@ -124,12 +126,17 @@ static char _debug_prefetch_buf[_DEBUG_P
|
||||
*************************************************************/
|
||||
static int gmac_initialized = 0;
|
||||
TOE_INFO_T toe_private_data;
|
||||
@@ -35,7 +35,7 @@ Index: linux-2.6.23.16/drivers/net/sl351x_gmac.c
|
||||
|
||||
#undef CONFIG_SL351x_RXTOE
|
||||
extern NAT_CFG_T nat_cfg;
|
||||
@@ -2443,7 +2450,8 @@
|
||||
@@ -2443,7 +2450,8 @@ static irqreturn_t toe_gmac_interrupt (i
|
||||
toe = (TOE_INFO_T *)&toe_private_data;
|
||||
// handle NAPI
|
||||
#ifdef CONFIG_SL_NAPI
|
||||
@@ -45,7 +45,7 @@ Index: linux-2.6.23.16/drivers/net/sl351x_gmac.c
|
||||
{
|
||||
/* disable GMAC interrupt */
|
||||
//toe_gmac_disable_interrupt(tp->irq);
|
||||
@@ -2530,7 +2538,7 @@
|
||||
@@ -2530,7 +2538,7 @@ if (storlink_ctl.pauseoff == 1)
|
||||
{
|
||||
if (likely(netif_rx_schedule_prep(dev)))
|
||||
{
|
||||
@@ -54,7 +54,7 @@ Index: linux-2.6.23.16/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 @@
|
||||
@@ -2563,7 +2571,7 @@ if (storlink_ctl.pauseoff == 1)
|
||||
{
|
||||
if (likely(netif_rx_schedule_prep(dev)))
|
||||
{
|
||||
@@ -63,7 +63,7 @@ Index: linux-2.6.23.16/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 @@
|
||||
@@ -4217,7 +4225,7 @@ static int gmac_rx_poll(struct net_devic
|
||||
GMAC_INFO_T *tp = (GMAC_INFO_T *)dev->priv;
|
||||
unsigned int status4;
|
||||
volatile DMA_RWPTR_T fq_rwptr;
|
||||
@@ -72,7 +72,7 @@ Index: linux-2.6.23.16/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 @@
|
||||
@@ -4479,7 +4487,7 @@ static int gmac_rx_poll(struct net_devic
|
||||
|
||||
if (rwptr.bits.rptr == rwptr.bits.wptr)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user