diff options
Diffstat (limited to 'drivers/s390/net/lcs.c')
-rw-r--r-- | drivers/s390/net/lcs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index ecca1046714e..08a994fdd1a4 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1576,7 +1576,7 @@ __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, | |||
1576 | header->offset = card->tx_buffer->count; | 1576 | header->offset = card->tx_buffer->count; |
1577 | header->type = card->lan_type; | 1577 | header->type = card->lan_type; |
1578 | header->slot = card->portno; | 1578 | header->slot = card->portno; |
1579 | memcpy(header + 1, skb->data, skb->len); | 1579 | skb_copy_from_linear_data(skb, header + 1, skb->len); |
1580 | spin_unlock(&card->lock); | 1580 | spin_unlock(&card->lock); |
1581 | card->stats.tx_bytes += skb->len; | 1581 | card->stats.tx_bytes += skb->len; |
1582 | card->stats.tx_packets++; | 1582 | card->stats.tx_packets++; |
@@ -1784,7 +1784,6 @@ lcs_get_skb(struct lcs_card *card, char *skb_data, unsigned int skb_len) | |||
1784 | card->stats.rx_dropped++; | 1784 | card->stats.rx_dropped++; |
1785 | return; | 1785 | return; |
1786 | } | 1786 | } |
1787 | skb->dev = card->dev; | ||
1788 | memcpy(skb_put(skb, skb_len), skb_data, skb_len); | 1787 | memcpy(skb_put(skb, skb_len), skb_data, skb_len); |
1789 | skb->protocol = card->lan_type_trans(skb, card->dev); | 1788 | skb->protocol = card->lan_type_trans(skb, card->dev); |
1790 | card->stats.rx_bytes += skb_len; | 1789 | card->stats.rx_bytes += skb_len; |