diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-11-28 18:03:48 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-11-28 18:03:48 +0000 |
| commit | 629cc5b101eb73511cdc2f795ba3977d1c0b3482 (patch) | |
| tree | 8948478aa99a099e90b7903c1ac11621029baa05 /target/linux/ar7 | |
| parent | a2aa5a227ed26ab34338e99f4c893b629225eb08 (diff) | |
| download | upstream-629cc5b101eb73511cdc2f795ba3977d1c0b3482.tar.gz upstream-629cc5b101eb73511cdc2f795ba3977d1c0b3482.tar.bz2 upstream-629cc5b101eb73511cdc2f795ba3977d1c0b3482.zip | |
refresh 973-cpmac_handle_mvswitch.patch
SVN-Revision: 24179
Diffstat (limited to 'target/linux/ar7')
| -rw-r--r-- | target/linux/ar7/patches-2.6.32/973-cpmac_handle_mvswitch.patch | 16 |
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; } |