Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / drivers / net / atari_bionet.c

diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 92b5213..3d87bd2 100644 (file)
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -220,7 +220,7 @@ gsend:
 }
 
 static irqreturn_t
-bionet_intr(int irq, void *data, struct pt_regs *fp) {
+bionet_intr(int irq, void *data) {
        return IRQ_HANDLED;
 }
 
@@ -453,7 +453,8 @@ bionet_send_packet(struct sk_buff *skb, struct net_device *dev) {
                stdma_lock(bionet_intr, NULL);
                local_irq_restore(flags);
                if( !STRAM_ADDR(buf+length-1) ) {
-                       memcpy(nic_packet->buffer, skb->data, length);
+                       skb_copy_from_linear_data(skb, nic_packet->buffer,
+                                                 length);
                        buf = (unsigned long)&((struct nic_pkt_s *)phys_nic_packet)->buffer;
                }
 
@@ -544,13 +545,13 @@ bionet_poll_rx(struct net_device *dev) {
                                break;
                        }
 
-                       skb->dev = dev;
                        skb_reserve( skb, 2 );          /* 16 Byte align  */
                        skb_put( skb, pkt_len );        /* make room */
 
                        /* 'skb->data' points to the start of sk_buff data area.
                         */
-                       memcpy(skb->data, nic_packet->buffer, pkt_len);
+                       skb_copy_to_linear_data(skb, nic_packet->buffer,
+                                               pkt_len);
                        skb->protocol = eth_type_trans( skb, dev );
                        netif_rx(skb);
                        dev->last_rx = jiffies;