r8169: use netdev_alloc_skb

[linux-2.6-omap-h63xx.git] / drivers / net / rrunner.c

diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 6108bac8d56a277d50b851e411263d7938fc1184..25c73d47daad9c29c0bb52e5c9035efbd9818909 100644 (file)
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -1029,7 +1029,6 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
                                        goto defer;
                                }
                        }
-                       skb->dev = dev;
                        skb->protocol = hippi_type_trans(skb, dev);
 
                        netif_rx(skb);          /* send it up */
@@ -1053,7 +1052,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index)
 }
 
 
-static irqreturn_t rr_interrupt(int irq, void *dev_id, struct pt_regs *ptregs)
+static irqreturn_t rr_interrupt(int irq, void *dev_id)
 {
        struct rr_private *rrpriv;
        struct rr_regs __iomem *regs;
@@ -1452,7 +1451,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev)
                }
                skb_reserve(new_skb, 8);
                skb_put(new_skb, len);
-               memcpy(new_skb->data, skb->data, len);
+               skb_copy_from_linear_data(skb, new_skb->data, len);
                dev_kfree_skb(skb);
                skb = new_skb;
        }