1 files changed, 7 insertions, 18 deletions

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 6b8d882d197b..bcbf2fa9b94a 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1495,24 +1495,18 @@ static inline void velocity_rx_csum(struct rx_desc *rd, struct sk_buff *skb)
  *      enough. This function returns a negative value if the received
  *      packet is too big or if memory is exhausted.
  */
-static inline int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
-                                   struct velocity_info *vptr)
+static int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
+                            struct velocity_info *vptr)
 {
         int ret = -1;
-
         if (pkt_size < rx_copybreak) {
                 struct sk_buff *new_skb;
 
-                new_skb = dev_alloc_skb(pkt_size + 2);
+                new_skb = netdev_alloc_skb(vptr->dev, pkt_size + 2);
                 if (new_skb) {
-                        new_skb->dev = vptr->dev;
                         new_skb->ip_summed = rx_skb[0]->ip_summed;
-
-                        if (vptr->flags & VELOCITY_FLAGS_IP_ALIGN)
-                                skb_reserve(new_skb, 2);
-
-                        skb_copy_from_linear_data(rx_skb[0], new_skb->data,
-                                                  pkt_size);
+                        skb_reserve(new_skb, 2);
+                        skb_copy_from_linear_data(*rx_skb, new_skb->data, pkt_size);
                         *rx_skb = new_skb;
                         ret = 0;
                 }
@@ -1533,12 +1527,8 @@ static inline int velocity_rx_copy(struct sk_buff **rx_skb, int pkt_size,
 static inline void velocity_iph_realign(struct velocity_info *vptr,
                                         struct sk_buff *skb, int pkt_size)
 {
-        /* FIXME - memmove ? */
         if (vptr->flags & VELOCITY_FLAGS_IP_ALIGN) {
-                int i;
-
-                for (i = pkt_size; i >= 0; i--)
-                        *(skb->data + i + 2) = *(skb->data + i);
+                memmove(skb->data + 2, skb->data, pkt_size);
                 skb_reserve(skb, 2);
         }
 }
@@ -1629,7 +1619,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
         struct rx_desc *rd = &(vptr->rd_ring[idx]);
         struct velocity_rd_info *rd_info = &(vptr->rd_info[idx]);
 
-        rd_info->skb = dev_alloc_skb(vptr->rx_buf_sz + 64);
+        rd_info->skb = netdev_alloc_skb(vptr->dev, vptr->rx_buf_sz + 64);
         if (rd_info->skb == NULL)
                 return -ENOMEM;
 
@@ -1638,7 +1628,6 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
          *      64byte alignment.
          */
         skb_reserve(rd_info->skb, (unsigned long) rd_info->skb->data & 63);
-        rd_info->skb->dev = vptr->dev;
         rd_info->skb_dma = pci_map_single(vptr->pdev, rd_info->skb->data, vptr->rx_buf_sz, PCI_DMA_FROMDEVICE);
 
         /*