Skip to content

Commit

Permalink
ipg: fix jumbo frame compilation
Browse files Browse the repository at this point in the history
Make jumbo frame support compile again. It was broken by the cleanup series
before the merge because the code is hidden under JUMBO_FRAME #ifdef.

Tested-by: Andrew Savchenko <Bircoph@list.ru>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Pekka Enberg authored and Jeff Garzik committed Jun 27, 2008
1 parent 3f6602a commit ecfecfb
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/ipg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1271,16 +1271,16 @@ static void ipg_nic_rx_with_end(struct net_device *dev,

framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;

endframeLen = framelen - jumbo->current_size;
endframelen = framelen - jumbo->current_size;
/*
if (framelen > IPG_RXFRAG_SIZE)
framelen=IPG_RXFRAG_SIZE;
*/
if (framelen > IPG_RXSUPPORT_SIZE)
dev_kfree_skb_irq(jumbo->skb);
else {
memcpy(skb_put(jumbo->skb, endframeLen),
skb->data, endframeLen);
memcpy(skb_put(jumbo->skb, endframelen),
skb->data, endframelen);

jumbo->skb->protocol =
eth_type_trans(jumbo->skb, dev);
Expand Down Expand Up @@ -1352,16 +1352,16 @@ static int ipg_nic_rx(struct net_device *dev)

switch (ipg_nic_rx_check_frame_type(dev)) {
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;
case FRAME_WITH_START:
ipg_nic_rx_with_start(dev, tp, rxfd, entry);
ipg_nic_rx_with_start(dev, sp, rxfd, entry);
break;
case FRAME_WITH_END:
ipg_nic_rx_with_end(dev, tp, rxfd, entry);
ipg_nic_rx_with_end(dev, sp, rxfd, entry);
break;
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;
}
}
Expand Down

0 comments on commit ecfecfb

Please sign in to comment.