From b268da3006f140f0c9cba0bfb3958a89757a5585 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 23 Jun 2008 14:36:18 +0300
Subject: [PATCH] --- yaml --- r: 103234 b: refs/heads/master c:
 39f205854c829294f9b4db65100d3abdf9c9c145 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/ipg.c | 9 +++++----
 trunk/drivers/net/ipg.h | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e4285d39e153..70765a17a921 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18a9cdb9c7ec88f6e94cd8dcb03fb6cded067119
+refs/heads/master: 39f205854c829294f9b4db65100d3abdf9c9c145
diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c
index 5c5653bd48c1..51d5f30e0afe 100644
--- a/trunk/drivers/net/ipg.c
+++ b/trunk/drivers/net/ipg.c
@@ -730,7 +730,7 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
 
 	IPG_DEBUG_MSG("_get_rxbuff\n");
 
-	skb = netdev_alloc_skb(dev, IPG_RXSUPPORT_SIZE + NET_IP_ALIGN);
+	skb = netdev_alloc_skb(dev, sp->rxsupport_size + NET_IP_ALIGN);
 	if (!skb) {
 		sp->rx_buff[entry] = NULL;
 		return -ENOMEM;
@@ -1270,7 +1270,7 @@ 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;
-			if (framelen > IPG_RXSUPPORT_SIZE)
+			if (framelen > sp->rxsupport_size)
 				dev_kfree_skb_irq(jumbo->skb);
 			else {
 				memcpy(skb_put(jumbo->skb, endframelen),
@@ -1311,7 +1311,7 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev,
 		if (skb) {
 			if (jumbo->found_start) {
 				jumbo->current_size += sp->rxfrag_size;
-				if (jumbo->current_size <= IPG_RXSUPPORT_SIZE) {
+				if (jumbo->current_size <= sp->rxsupport_size) {
 					memcpy(skb_put(jumbo->skb,
 						       sp->rxfrag_size),
 					       skb->data, sp->rxfrag_size);
@@ -1744,7 +1744,7 @@ static int ipg_nic_open(struct net_device *dev)
 
 	IPG_DEBUG_MSG("_nic_open\n");
 
-	sp->rx_buf_sz = IPG_RXSUPPORT_SIZE;
+	sp->rx_buf_sz = sp->rxsupport_size;
 
 	/* Check for interrupt line conflicts, and request interrupt
 	 * line for IPG.
@@ -2237,6 +2237,7 @@ static int __devinit ipg_probe(struct pci_dev *pdev,
 
 	sp->is_jumbo = IPG_JUMBO;
 	sp->rxfrag_size = IPG_RXFRAG_SIZE;
+	sp->rxsupport_size = IPG_RXSUPPORT_SIZE;
 
 	/* Declare IPG NIC functions for Ethernet device methods.
 	 */
diff --git a/trunk/drivers/net/ipg.h b/trunk/drivers/net/ipg.h
index 83e311ebf0cb..9ff4511d21cb 100644
--- a/trunk/drivers/net/ipg.h
+++ b/trunk/drivers/net/ipg.h
@@ -797,6 +797,7 @@ struct ipg_nic_private {
 	bool is_jumbo;
 	struct ipg_jumbo jumbo;
 	unsigned long rxfrag_size;
+	unsigned long rxsupport_size;
 	unsigned int rx_buf_sz;
 	struct pci_dev *pdev;
 	struct net_device *dev;