From 249455db69bf558c386ba7bde050844e2f0ec2b3 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 19 May 2008 07:06:35 +0000 Subject: [ar7] refresh kernel patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11196 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff') diff --git a/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff b/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff index d99243f8af..b06f5be19d 100644 --- a/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff +++ b/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff @@ -1,8 +1,8 @@ -Index: linux-2.6.25.1/drivers/net/cpmac.c +Index: linux-2.6.25.4/drivers/net/cpmac.c =================================================================== ---- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:24:08.000000000 +0200 -+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:24:37.000000000 +0200 -@@ -187,6 +187,7 @@ +--- linux-2.6.25.4.orig/drivers/net/cpmac.c ++++ linux-2.6.25.4/drivers/net/cpmac.c +@@ -187,6 +187,7 @@ struct cpmac_desc { #define CPMAC_EOQ 0x1000 struct sk_buff *skb; struct cpmac_desc *next; @@ -10,7 +10,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c dma_addr_t mapping; dma_addr_t data_mapping; }; -@@ -242,6 +243,16 @@ +@@ -242,6 +243,16 @@ static void cpmac_dump_desc(struct net_d printk("\n"); } @@ -27,7 +27,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb) { int i; -@@ -413,21 +424,40 @@ +@@ -413,21 +424,40 @@ static struct sk_buff *cpmac_rx_one(stru static int cpmac_poll(struct napi_struct *napi, int budget) { struct sk_buff *skb; @@ -70,7 +70,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c skb = cpmac_rx_one(priv, desc); if (likely(skb)) { netif_receive_skb(skb); -@@ -436,19 +466,81 @@ +@@ -436,19 +466,81 @@ static int cpmac_poll(struct napi_struct desc = desc->next; } @@ -154,7 +154,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c } static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) -@@ -625,8 +717,10 @@ +@@ -625,8 +717,10 @@ static void cpmac_clear_rx(struct net_de desc->dataflags = CPMAC_OWN; dev->stats.rx_dropped++; } @@ -165,7 +165,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c } static void cpmac_clear_tx(struct net_device *dev) -@@ -928,9 +1022,12 @@ +@@ -928,9 +1022,12 @@ static int cpmac_open(struct net_device desc->buflen = CPMAC_SKB_SIZE; desc->dataflags = CPMAC_OWN; desc->next = &priv->rx_head[(i + 1) % priv->ring_size]; -- cgit v1.2.3