lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipg: per-device rxsupport_size

Browse Source 
Add a ->max_rxframe member to struct ipg_nic_private and convert the users of
IPG_RXSUPPORT_SIZE to use it instead to enable per-device jumbo frame
configuration.

Tested-by: Andrew Savchenko <Bircoph@list.ru>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Pekka Enberg
2008-06-23 14:36:18 +03:00
committed by Jeff Garzik
parent 18a9cdb9c7
commit 39f205854c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ipg.c
View File

@@ -730,7 +730,7 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
IPG_DEBUG_MSG("_get_rxbuff\n"); 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) { if (!skb) {
sp->rx_buff[entry] = NULL; sp->rx_buff[entry] = NULL;
return -ENOMEM; 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; framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;
endframelen = framelen - jumbo->current_size; endframelen = framelen - jumbo->current_size;
if (framelen > IPG_RXSUPPORT_SIZE) if (framelen > sp->rxsupport_size)
dev_kfree_skb_irq(jumbo->skb); dev_kfree_skb_irq(jumbo->skb);
else { else {
memcpy(skb_put(jumbo->skb, endframelen), 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 (skb) {
if (jumbo->found_start) { if (jumbo->found_start) {
jumbo->current_size += sp->rxfrag_size; 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, memcpy(skb_put(jumbo->skb,
sp->rxfrag_size), sp->rxfrag_size),
skb->data, 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"); 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 /* Check for interrupt line conflicts, and request interrupt
* line for IPG. * line for IPG.
@@ -2237,6 +2237,7 @@ static int __devinit ipg_probe(struct pci_dev *pdev,
sp->is_jumbo = IPG_JUMBO; sp->is_jumbo = IPG_JUMBO;
sp->rxfrag_size = IPG_RXFRAG_SIZE; sp->rxfrag_size = IPG_RXFRAG_SIZE;
sp->rxsupport_size = IPG_RXSUPPORT_SIZE;
/* Declare IPG NIC functions for Ethernet device methods. /* Declare IPG NIC functions for Ethernet device methods.
*/ */

1
drivers/net/ipg.h
View File

@@ -797,6 +797,7 @@ struct ipg_nic_private {
bool is_jumbo; bool is_jumbo;
struct ipg_jumbo jumbo; struct ipg_jumbo jumbo;
unsigned long rxfrag_size; unsigned long rxfrag_size;
unsigned long rxsupport_size;
unsigned int rx_buf_sz; unsigned int rx_buf_sz;
struct pci_dev *pdev; struct pci_dev *pdev;
struct net_device *dev; struct net_device *dev;