aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2011-03-05 20:53:21 +0000
committerMichael Büsch <mb@bu3sch.de>2011-03-05 20:53:21 +0000
commit42233dcf8efe42ed7d17ca3143c2cc09c7d79483 (patch)
treec07fae373c08cee716eb060fa8841fc486a0884e /target/linux/generic/patches-2.6.37
parent9e7801b91344e6fe66032e8a06c6a01b825f0ade (diff)
downloadupstream-42233dcf8efe42ed7d17ca3143c2cc09c7d79483.tar.gz
upstream-42233dcf8efe42ed7d17ca3143c2cc09c7d79483.tar.bz2
upstream-42233dcf8efe42ed7d17ca3143c2cc09c7d79483.zip
atm/solos-pci: Fix incorrectly applied patch. Thanks to Philip A. Prindeville for pointing it out.
SVN-Revision: 25881
Diffstat (limited to 'target/linux/generic/patches-2.6.37')
-rw-r--r--target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch31
1 files changed, 15 insertions, 16 deletions
diff --git a/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch b/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
index 2071ac4b80..06d3f8c08c 100644
--- a/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
+++ b/target/linux/generic/patches-2.6.37/281-solos_uniform_vpi_vci.patch
@@ -1,16 +1,15 @@
---- /dev/null
-+++ b/linux/generic/patches-2.6.37/281-solos_vpi_order.patch
-@@ -0,0 +1,13 @@
-+--- a/drivers/atm/solos-pci.c 2010-12-24 01:07:09.000000000 -0700
-++++ b/drivers/atm/solos-pci.c 2010-12-24 14:18:45.000000000 -0700
-+@@ -734,8 +734,8 @@ void solos_bh(unsigned long card_arg)
-+ le16_to_cpu(header->vci));
-+ if (!vcc) {
-+ if (net_ratelimit())
-+- dev_warn(&card->dev->dev, "Received packet for unknown VCI.VPI %d.%d on port %d\n",
-+- le16_to_cpu(header->vci), le16_to_cpu(header->vpi),
-++ dev_warn(&card->dev->dev, "Received packet for unknown VPI.VCI %d.%d on port %d\n",
-++ le16_to_cpu(header->vpi), le16_to_cpu(header->vci),
-+ port);
-+ continue;
-+ }
+Index: linux-2.6.37/drivers/atm/solos-pci.c
+===================================================================
+--- linux-2.6.37.orig/drivers/atm/solos-pci.c 2011-03-05 21:46:26.136023697 +0100
++++ linux-2.6.37/drivers/atm/solos-pci.c 2011-03-05 21:48:49.046598163 +0100
+@@ -710,8 +710,8 @@ void solos_bh(unsigned long card_arg)
+ le16_to_cpu(header->vci));
+ if (!vcc) {
+ if (net_ratelimit())
+- dev_warn(&card->dev->dev, "Received packet for unknown VCI.VPI %d.%d on port %d\n",
+- le16_to_cpu(header->vci), le16_to_cpu(header->vpi),
++ dev_warn(&card->dev->dev, "Received packet for unknown VPI.VCI %d.%d on port %d\n",
++ le16_to_cpu(header->vpi), le16_to_cpu(header->vci),
+ port);
+ continue;
+ }