|
@@ -1271,7 +1271,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev,
|
|
|
|
|
|
framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;
|
|
framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;
|
|
|
|
|
|
- endframeLen = framelen - jumbo->current_size;
|
|
|
|
|
|
+ endframelen = framelen - jumbo->current_size;
|
|
/*
|
|
/*
|
|
if (framelen > IPG_RXFRAG_SIZE)
|
|
if (framelen > IPG_RXFRAG_SIZE)
|
|
framelen=IPG_RXFRAG_SIZE;
|
|
framelen=IPG_RXFRAG_SIZE;
|
|
@@ -1279,8 +1279,8 @@ static void ipg_nic_rx_with_end(struct net_device *dev,
|
|
if (framelen > IPG_RXSUPPORT_SIZE)
|
|
if (framelen > IPG_RXSUPPORT_SIZE)
|
|
dev_kfree_skb_irq(jumbo->skb);
|
|
dev_kfree_skb_irq(jumbo->skb);
|
|
else {
|
|
else {
|
|
- memcpy(skb_put(jumbo->skb, endframeLen),
|
|
|
|
- skb->data, endframeLen);
|
|
|
|
|
|
+ memcpy(skb_put(jumbo->skb, endframelen),
|
|
|
|
+ skb->data, endframelen);
|
|
|
|
|
|
jumbo->skb->protocol =
|
|
jumbo->skb->protocol =
|
|
eth_type_trans(jumbo->skb, dev);
|
|
eth_type_trans(jumbo->skb, dev);
|
|
@@ -1352,16 +1352,16 @@ static int ipg_nic_rx(struct net_device *dev)
|
|
|
|
|
|
switch (ipg_nic_rx_check_frame_type(dev)) {
|
|
switch (ipg_nic_rx_check_frame_type(dev)) {
|
|
case FRAME_WITH_START_WITH_END:
|
|
case FRAME_WITH_START_WITH_END:
|
|
- ipg_nic_rx_with_start_and_end(dev, tp, rxfd, entry);
|
|
|
|
|
|
+ ipg_nic_rx_with_start_and_end(dev, sp, rxfd, entry);
|
|
break;
|
|
break;
|
|
case FRAME_WITH_START:
|
|
case FRAME_WITH_START:
|
|
- ipg_nic_rx_with_start(dev, tp, rxfd, entry);
|
|
|
|
|
|
+ ipg_nic_rx_with_start(dev, sp, rxfd, entry);
|
|
break;
|
|
break;
|
|
case FRAME_WITH_END:
|
|
case FRAME_WITH_END:
|
|
- ipg_nic_rx_with_end(dev, tp, rxfd, entry);
|
|
|
|
|
|
+ ipg_nic_rx_with_end(dev, sp, rxfd, entry);
|
|
break;
|
|
break;
|
|
case FRAME_NO_START_NO_END:
|
|
case FRAME_NO_START_NO_END:
|
|
- ipg_nic_rx_no_start_no_end(dev, tp, rxfd, entry);
|
|
|
|
|
|
+ ipg_nic_rx_no_start_no_end(dev, sp, rxfd, entry);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|