atm/solos-pci: Fix incorrectly applied patch. Thanks to Philip A. Prindeville for pointing it out.

SVN-Revision: 25881
owl
Michael Büsch 2011-03-05 20:53:21 +00:00
parent 9e7801b913
commit 42233dcf8e
1 changed files with 15 additions and 16 deletions

View File

@ -1,16 +1,15 @@
--- /dev/null Index: linux-2.6.37/drivers/atm/solos-pci.c
+++ b/linux/generic/patches-2.6.37/281-solos_vpi_order.patch ===================================================================
@@ -0,0 +1,13 @@ --- linux-2.6.37.orig/drivers/atm/solos-pci.c 2011-03-05 21:46:26.136023697 +0100
+--- a/drivers/atm/solos-pci.c 2010-12-24 01:07:09.000000000 -0700 +++ linux-2.6.37/drivers/atm/solos-pci.c 2011-03-05 21:48:49.046598163 +0100
++++ b/drivers/atm/solos-pci.c 2010-12-24 14:18:45.000000000 -0700 @@ -710,8 +710,8 @@ void solos_bh(unsigned long card_arg)
+@@ -734,8 +734,8 @@ void solos_bh(unsigned long card_arg) le16_to_cpu(header->vci));
+ le16_to_cpu(header->vci)); if (!vcc) {
+ if (!vcc) { if (net_ratelimit())
+ if (net_ratelimit()) - dev_warn(&card->dev->dev, "Received packet for unknown VCI.VPI %d.%d on port %d\n",
+- 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),
+- 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",
++ 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),
++ le16_to_cpu(header->vpi), le16_to_cpu(header->vci), port);
+ port); continue;
+ continue; }
+ }