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 --- target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch') diff --git a/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch b/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch index 2435b3518e..5ef2efdbdc 100644 --- a/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch +++ b/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch @@ -1,7 +1,7 @@ -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-01 23:45:25.000000000 +0200 -+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:21:17.000000000 +0200 +--- linux-2.6.25.4.orig/drivers/net/cpmac.c ++++ linux-2.6.25.4/drivers/net/cpmac.c @@ -38,6 +38,7 @@ #include #include @@ -10,7 +10,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c MODULE_AUTHOR("Eugene Konev "); MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)"); -@@ -207,6 +208,7 @@ +@@ -207,6 +208,7 @@ struct cpmac_priv { struct work_struct reset_work; struct platform_device *pdev; struct napi_struct napi; @@ -18,7 +18,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c }; static irqreturn_t cpmac_irq(int, void *); -@@ -455,6 +457,9 @@ +@@ -455,6 +457,9 @@ static int cpmac_start_xmit(struct sk_bu struct cpmac_desc *desc; struct cpmac_priv *priv = netdev_priv(dev); @@ -28,7 +28,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c if (unlikely(skb_padto(skb, ETH_ZLEN))) return NETDEV_TX_OK; -@@ -634,14 +639,14 @@ +@@ -634,14 +639,14 @@ static void cpmac_clear_tx(struct net_de priv->desc_ring[i].dataflags = 0; if (priv->desc_ring[i].skb) { dev_kfree_skb_any(priv->desc_ring[i].skb); @@ -45,7 +45,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c struct cpmac_priv *priv = container_of(work, struct cpmac_priv, reset_work); -@@ -650,8 +655,47 @@ +@@ -650,8 +655,47 @@ static void cpmac_hw_error(struct work_s spin_unlock(&priv->rx_lock); cpmac_clear_tx(priv->dev); cpmac_hw_start(priv->dev); @@ -95,7 +95,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c } static irqreturn_t cpmac_irq(int irq, void *dev_id) -@@ -682,49 +726,33 @@ +@@ -682,49 +726,33 @@ static irqreturn_t cpmac_irq(int irq, vo cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0); @@ -159,7 +159,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c } static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -@@ -911,6 +939,7 @@ +@@ -911,6 +939,7 @@ static int cpmac_open(struct net_device goto fail_irq; } -- cgit v1.2.3