summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch')
-rw-r--r--target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch16
1 files changed, 7 insertions, 9 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 7a2ce1453..13cfdc28f 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,6 @@
-Index: linux-2.6.32.26/drivers/net/cpmac.c
-===================================================================
---- 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 @@
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -369,6 +369,7 @@ static struct sk_buff *cpmac_rx_one(stru
struct cpmac_desc *desc)
{
struct sk_buff *skb, *result = NULL;
@@ -10,7 +8,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
if (unlikely(netif_msg_hw(priv)))
cpmac_dump_desc(priv->dev, desc);
-@@ -382,9 +383,13 @@
+@@ -382,9 +383,13 @@ static struct sk_buff *cpmac_rx_one(stru
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
if (likely(skb)) {
@@ -26,7 +24,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
desc->skb->ip_summed = CHECKSUM_NONE;
priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += desc->datalen;
-@@ -456,7 +461,12 @@
+@@ -456,7 +461,12 @@ static int cpmac_poll(struct napi_struct
skb = cpmac_rx_one(priv, desc);
if (likely(skb)) {
@@ -40,7 +38,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
received++;
}
desc = desc->next;
-@@ -951,7 +961,7 @@
+@@ -951,7 +961,7 @@ static void cpmac_adjust_link(struct net
static int cpmac_open(struct net_device *dev)
{
@@ -49,7 +47,7 @@ Index: linux-2.6.32.26/drivers/net/cpmac.c
struct cpmac_priv *priv = netdev_priv(dev);
struct resource *mem;
struct cpmac_desc *desc;
-@@ -995,7 +1005,12 @@
+@@ -995,7 +1005,12 @@ static int cpmac_open(struct net_device
res = -ENOMEM;
goto fail_desc;
}