diff options
Diffstat (limited to 'drivers/net/atari_pamsnet.c')
-rw-r--r-- | drivers/net/atari_pamsnet.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c index 3b5436149286..54714409a09b 100644 --- a/drivers/net/atari_pamsnet.c +++ b/drivers/net/atari_pamsnet.c | |||
@@ -717,7 +717,8 @@ pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) { | |||
717 | 717 | ||
718 | local_irq_restore(flags); | 718 | local_irq_restore(flags); |
719 | if( !STRAM_ADDR(buf+length-1) ) { | 719 | if( !STRAM_ADDR(buf+length-1) ) { |
720 | memcpy(nic_packet->buffer, skb->data, length); | 720 | skb_copy_from_linear_data(skb, nic_packet->buffer, |
721 | length); | ||
721 | buf = (unsigned long)phys_nic_packet; | 722 | buf = (unsigned long)phys_nic_packet; |
722 | } | 723 | } |
723 | 724 | ||
@@ -792,7 +793,8 @@ pamsnet_poll_rx(struct net_device *dev) { | |||
792 | 793 | ||
793 | /* 'skb->data' points to the start of sk_buff data area. | 794 | /* 'skb->data' points to the start of sk_buff data area. |
794 | */ | 795 | */ |
795 | memcpy(skb->data, nic_packet->buffer, pkt_len); | 796 | skb_copy_to_linear_data(skb, nic_packet->buffer, |
797 | pkt_len); | ||
796 | netif_rx(skb); | 798 | netif_rx(skb); |
797 | dev->last_rx = jiffies; | 799 | dev->last_rx = jiffies; |
798 | lp->stats.rx_packets++; | 800 | lp->stats.rx_packets++; |