diff options
Diffstat (limited to 'drivers/net/fs_enet')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 9f6ef315ce51..e2ddd617493a 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
| @@ -160,7 +160,8 @@ static int fs_enet_rx_napi(struct net_device *dev, int *budget) | |||
| 160 | skbn = dev_alloc_skb(pkt_len + 2); | 160 | skbn = dev_alloc_skb(pkt_len + 2); |
| 161 | if (skbn != NULL) { | 161 | if (skbn != NULL) { |
| 162 | skb_reserve(skbn, 2); /* align IP header */ | 162 | skb_reserve(skbn, 2); /* align IP header */ |
| 163 | memcpy(skbn->data, skb->data, pkt_len); | 163 | skb_copy_from_linear_data(skb, |
| 164 | skbn->data, pkt_len); | ||
| 164 | /* swap */ | 165 | /* swap */ |
| 165 | skbt = skb; | 166 | skbt = skb; |
| 166 | skb = skbn; | 167 | skb = skbn; |
| @@ -293,7 +294,8 @@ static int fs_enet_rx_non_napi(struct net_device *dev) | |||
| 293 | skbn = dev_alloc_skb(pkt_len + 2); | 294 | skbn = dev_alloc_skb(pkt_len + 2); |
| 294 | if (skbn != NULL) { | 295 | if (skbn != NULL) { |
| 295 | skb_reserve(skbn, 2); /* align IP header */ | 296 | skb_reserve(skbn, 2); /* align IP header */ |
| 296 | memcpy(skbn->data, skb->data, pkt_len); | 297 | skb_copy_from_linear_data(skb, |
| 298 | skbn->data, pkt_len); | ||
| 297 | /* swap */ | 299 | /* swap */ |
| 298 | skbt = skb; | 300 | skbt = skb; |
| 299 | skb = skbn; | 301 | skb = skbn; |