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