qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 09:17:42 +02:00
Code

[ar7] refresh 973-cpmac_handle_mvswitch.patch

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24179 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-11-28 18:03:48 +00:00
parent 71bfc1ff04
commit 45f1499380
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch
View File

@ -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.26.orig/drivers/net/cpmac.c 2010-11-28 05:23:59.482390691 -0800
+++ linux-2.6.32.25/drivers/net/cpmac.c 2010-11-24 12:17:56.279985384 -0800 +++ linux-2.6.32.26/drivers/net/cpmac.c 2010-11-28 05:26:02.494883201 -0800
@@ -387,6 +387,7 @@ @@ -369,6 +369,7 @@
struct cpmac_desc *desc) struct cpmac_desc *desc)
{ {
struct sk_buff *skb, *result = NULL; 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))) if (unlikely(netif_msg_hw(priv)))
cpmac_dump_desc(priv->dev, desc); cpmac_dump_desc(priv->dev, desc);
@@ -400,9 +401,13 @@ @@ -382,9 +383,13 @@
skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE); skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
if (likely(skb)) { if (likely(skb)) {
@ -26,7 +26,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
desc->skb->ip_summed = CHECKSUM_NONE; desc->skb->ip_summed = CHECKSUM_NONE;
priv->dev->stats.rx_packets++; priv->dev->stats.rx_packets++;
priv->dev->stats.rx_bytes += desc->datalen; priv->dev->stats.rx_bytes += desc->datalen;
@@ -474,7 +479,12 @@ @@ -456,7 +461,12 @@
skb = cpmac_rx_one(priv, desc); skb = cpmac_rx_one(priv, desc);
if (likely(skb)) { if (likely(skb)) {
@ -40,7 +40,7 @@ Index: linux-2.6.32.25/drivers/net/cpmac.c
received++; received++;
} }
desc = desc->next; desc = desc->next;
@@ -970,7 +980,7 @@ @@ -951,7 +961,7 @@
static int cpmac_open(struct net_device *dev) 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 cpmac_priv *priv = netdev_priv(dev);
struct resource *mem; struct resource *mem;
struct cpmac_desc *desc; struct cpmac_desc *desc;
@@ -1014,7 +1024,12 @@ @@ -995,7 +1005,12 @@
res = -ENOMEM; res = -ENOMEM;
goto fail_desc; goto fail_desc;
} }