diff options
Diffstat (limited to 'drivers/net/ni52.c')
-rw-r--r-- | drivers/net/ni52.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index a6f4b24b0176..8dbd6d1900b5 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
@@ -934,7 +934,6 @@ static void ni52_rcv_int(struct net_device *dev) | |||
934 | skb = (struct sk_buff *) dev_alloc_skb(totlen+2); | 934 | skb = (struct sk_buff *) dev_alloc_skb(totlen+2); |
935 | if(skb != NULL) | 935 | if(skb != NULL) |
936 | { | 936 | { |
937 | skb->dev = dev; | ||
938 | skb_reserve(skb,2); | 937 | skb_reserve(skb,2); |
939 | skb_put(skb,totlen); | 938 | skb_put(skb,totlen); |
940 | eth_copy_and_sum(skb,(char *) p->base+(unsigned long) rbd->buffer,totlen,0); | 939 | eth_copy_and_sum(skb,(char *) p->base+(unsigned long) rbd->buffer,totlen,0); |
@@ -1183,7 +1182,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
1183 | else | 1182 | else |
1184 | #endif | 1183 | #endif |
1185 | { | 1184 | { |
1186 | memcpy((char *)p->xmit_cbuffs[p->xmit_count],(char *)(skb->data),skb->len); | 1185 | skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len); |
1187 | len = skb->len; | 1186 | len = skb->len; |
1188 | if (len < ETH_ZLEN) { | 1187 | if (len < ETH_ZLEN) { |
1189 | len = ETH_ZLEN; | 1188 | len = ETH_ZLEN; |