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 f67d97de97f..879a2fff474 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -828,8 +828,8 @@ static int b44_rx(struct b44 *bp, int budget)  			skb_reserve(copy_skb, 2);  			skb_put(copy_skb, len);  			/* DMA sync done above, copy just the actual packet */ -			memcpy(copy_skb->data, skb->data+bp->rx_offset, len); - +			skb_copy_from_linear_data_offset(skb, bp->rx_offset, +							 copy_skb->data, len);  			skb = copy_skb;  		}  		skb->ip_summed = CHECKSUM_NONE; @@ -1006,7 +1006,8 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)  			goto err_out;  		} -		memcpy(skb_put(bounce_skb, len), skb->data, skb->len); +		skb_copy_from_linear_data(skb, skb_put(bounce_skb, len), +					  skb->len);  		dev_kfree_skb_any(skb);  		skb = bounce_skb;  	}  |