aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-11-28 18:03:48 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-11-28 18:03:48 +0000
commit6545f6b8004031e37e05b66f23c8f6ccd505896f (patch)
treea8793ce1928bf7fff9431d84ef72ab2106cade1f /target/linux/ar7
parent2fe72098a1e8b545a9f9f47348af8be55cf711f0 (diff)
downloadupstream-6545f6b8004031e37e05b66f23c8f6ccd505896f.tar.gz
upstream-6545f6b8004031e37e05b66f23c8f6ccd505896f.tar.bz2
upstream-6545f6b8004031e37e05b66f23c8f6ccd505896f.zip
[ar7] refresh 973-cpmac_handle_mvswitch.patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24179 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch b/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
index 23c66aa5b6..7a2ce14539 100644
--- a/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
+++ b/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.32.25/drivers/net/cpmac.c
+Index: linux-2.6.32.26/drivers/net/cpmac.c
===================================================================
---- linux-2.6.32.25.orig/drivers/net/cpmac.c 2010-11-24 12:16:56.067517245 -0800
-+++ linux-2.6.32.25/drivers/net/cpmac.c 2010-11-24 12:17:56.279985384 -0800
-@@ -387,6 +387,7 @@
+--- linux-2.6.32.26.orig/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
++++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:26:02.494883201 -0800
+@@ -369,6 +369,7 @@
struct cpmac_desc *desc)
{
struct sk_buff *skb, *result = NULL;
@@ -10,7 +10,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
if (unlikely(netif_msg_hw(priv)))
cpmac_dump_desc(priv->dev, desc);
-@@ -400,9 +401,13 @@
+@@ -382,9 +383,13 @@
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
if (likely(skb)) {
@@ -26,7 +26,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
desc->skb->ip_summed = CHECKSUM_NONE;
priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += desc->datalen;
-@@ -474,7 +479,12 @@
+@@ -456,7 +461,12 @@
skb = cpmac_rx_one(priv, desc);
if (likely(skb)) {
@@ -40,7 +40,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
received++;
}
desc = desc->next;
-@@ -970,7 +980,7 @@
+@@ -951,7 +961,7 @@
static int cpmac_open(struct net_device *dev)
{
@@ -49,7 +49,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
struct cpmac_priv *priv = netdev_priv(dev);
struct resource *mem;
struct cpmac_desc *desc;
-@@ -1014,7 +1024,12 @@
+@@ -995,7 +1005,12 @@
res = -ENOMEM;
goto fail_desc;
}