diff options
Diffstat (limited to 'drivers/net/b44.c')
-rw-r--r-- | drivers/net/b44.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index f67d97de97ff..879a2fff474e 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -828,8 +828,8 @@ static int b44_rx(struct b44 *bp, int budget) | |||
828 | skb_reserve(copy_skb, 2); | 828 | skb_reserve(copy_skb, 2); |
829 | skb_put(copy_skb, len); | 829 | skb_put(copy_skb, len); |
830 | /* DMA sync done above, copy just the actual packet */ | 830 | /* DMA sync done above, copy just the actual packet */ |
831 | memcpy(copy_skb->data, skb->data+bp->rx_offset, len); | 831 | skb_copy_from_linear_data_offset(skb, bp->rx_offset, |
832 | 832 | copy_skb->data, len); | |
833 | skb = copy_skb; | 833 | skb = copy_skb; |
834 | } | 834 | } |
835 | skb->ip_summed = CHECKSUM_NONE; | 835 | skb->ip_summed = CHECKSUM_NONE; |
@@ -1006,7 +1006,8 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1006 | goto err_out; | 1006 | goto err_out; |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | memcpy(skb_put(bounce_skb, len), skb->data, skb->len); | 1009 | skb_copy_from_linear_data(skb, skb_put(bounce_skb, len), |
1010 | skb->len); | ||
1010 | dev_kfree_skb_any(skb); | 1011 | dev_kfree_skb_any(skb); |
1011 | skb = bounce_skb; | 1012 | skb = bounce_skb; |
1012 | } | 1013 | } |