diff options
Diffstat (limited to 'drivers/net/dgrs.c')
-rw-r--r-- | drivers/net/dgrs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index a79520295fd0..df62c0232f36 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c | |||
@@ -503,7 +503,6 @@ dgrs_rcv_frame( | |||
503 | /* discarding the frame */ | 503 | /* discarding the frame */ |
504 | goto out; | 504 | goto out; |
505 | } | 505 | } |
506 | skb->dev = devN; | ||
507 | skb_reserve(skb, 2); /* Align IP header */ | 506 | skb_reserve(skb, 2); /* Align IP header */ |
508 | 507 | ||
509 | again: | 508 | again: |
@@ -742,7 +741,7 @@ static int dgrs_start_xmit(struct sk_buff *skb, struct net_device *devN) | |||
742 | } | 741 | } |
743 | 742 | ||
744 | amt = min_t(unsigned int, len, rbdp->size - count); | 743 | amt = min_t(unsigned int, len, rbdp->size - count); |
745 | memcpy( (char *) S2H(rbdp->buf) + count, skb->data + i, amt); | 744 | skb_copy_from_linear_data_offset(skb, i, S2H(rbdp->buf) + count, amt); |
746 | i += amt; | 745 | i += amt; |
747 | count += amt; | 746 | count += amt; |
748 | len -= amt; | 747 | len -= amt; |