Merge branch 'upstream-fixes' into upstream

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 69ff83101107..0258aaca9ed3 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) {
                 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/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 0917a767faf8..6a74608eb9a3 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
         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++;