2 network patches added

diff --git a/queue-2.6.18/mv643xx_eth-fix-obvious-typo-which-caused-build-breakage.patch b/queue-2.6.18/mv643xx_eth-fix-obvious-typo-which-caused-build-breakage.patch
new file mode 100644 (file)
index 0000000..81d2d13
--- /dev/null
+++ b/queue-2.6.18/mv643xx_eth-fix-obvious-typo-which-caused-build-breakage.patch
@@ -0,0 +1,33 @@
+From git-commits-head-owner@vger.kernel.org  Mon Oct  9 23:39:43 2006
+Date: Fri, 22 Sep 2006 22:59:03 GMT
+Message-Id: <200609222259.k8MMx3nR026426@hera.kernel.org>
+From: Jeff Garzik <jeff@garzik.org>
+To: stable@kernel.org
+Subject: [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
+
+From: Jeff Garzik <jeff@garzik.org>
+
+The last minute fix submitted by the author fixed a bug, but
+broke the driver build.
+
+Noticed by Al Viro, since I can't build on said platform.
+
+Signed-off-by: Jeff Garzik <jeff@garzik.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/net/mv643xx_eth.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.18.orig/drivers/net/mv643xx_eth.c
++++ linux-2.6.18/drivers/net/mv643xx_eth.c
+@@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(str
+       struct pkt_info pkt_info;
+ 
+       while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
+-              dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
++              dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
+                                                       DMA_FROM_DEVICE);
+               mp->rx_desc_count--;
+               received_packets++;

diff --git a/queue-2.6.18/netdrvr-lp486e-fix-typo.patch b/queue-2.6.18/netdrvr-lp486e-fix-typo.patch
new file mode 100644 (file)
index 0000000..0c44d23
--- /dev/null
+++ b/queue-2.6.18/netdrvr-lp486e-fix-typo.patch
@@ -0,0 +1,42 @@
+From git-commits-head-owner@vger.kernel.org  Mon Oct  9 23:40:39 2006
+Date: Fri, 22 Sep 2006 22:59:03 GMT
+Message-Id: <200609222259.k8MMx3Up026418@hera.kernel.org>
+From: Jeff Garzik <jeff@garzik.org>
+To: git-commits-head@vger.kernel.org
+Subject: netdrvr: lp486e: fix typo
+
+From: Jeff Garzik <jeff@garzik.org>
+
+inside #if 0'd code, but it bugged me.
+
+Really, we should probably just delete the driver.
+
+Signed-off-by: Jeff Garzik <jeff@garzik.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/lp486e.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- linux-2.6.18.orig/drivers/net/lp486e.c
++++ linux-2.6.18/drivers/net/lp486e.c
+@@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int
+               if (rbd) {
+                       rbd->pad = 0;
+                       rbd->count = 0;
+-                      rbd->skb = dev_alloc_skb(RX_SKB_SIZE);
++                      rbd->skb = dev_alloc_skb(RX_SKBSIZE);
+                       if (!rbd->skb) {
+                               printk("dev_alloc_skb failed");
+                       }
+                       rbd->next = rfd->rbd;
+                       if (i) {
+                               rfd->rbd->prev = rbd;
+-                              rbd->size = RX_SKB_SIZE;
++                              rbd->size = RX_SKBSIZE;
+                       } else {
+-                              rbd->size = (RX_SKB_SIZE | RBD_EL);
++                              rbd->size = (RX_SKBSIZE | RBD_EL);
+                               lp->rbd_tail = rbd;
+                       }
+ 

diff --git a/queue-2.6.18/series b/queue-2.6.18/series
index c3c8e5ba232f974995db722136f586cfd90294e1..a9b161ea5d39a20070be324c7a48ddf451beb461 100644 (file)
--- a/queue-2.6.18/series
+++ b/queue-2.6.18/series
@@ -16,3 +16,5 @@ alsa-fix-initiailization-of-user-space-controls.patch
 jbd-fix-commit-of-ordered-data-buffers.patch
 fix-longstanding-load-balancing-bug-in-the-scheduler.patch
 zone_reclaim-dynamic-slab-reclaim.patch
+mv643xx_eth-fix-obvious-typo-which-caused-build-breakage.patch
+netdrvr-lp486e-fix-typo.patch