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

Merge branch 'master' into upstream-fixes

Browse Source
This commit is contained in:
Jeff Garzik
2006-10-11 03:56:12 -04:00
parent 2f614fe04f 53a5fbdc2d
commit 24fcbacedb
1719 changed files with 8377 additions and 8898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ibmveth.c
View File

@@ -93,7 +93,7 @@ static void ibmveth_proc_register_driver(void);
static void ibmveth_proc_unregister_driver(void);
static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);
static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance);
static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
static struct kobj_type ktype_veth_pool;
@@ -570,7 +570,7 @@ static int ibmveth_open(struct net_device *netdev)
}
ibmveth_debug_printk("initial replenish cycle\n");
ibmveth_interrupt(netdev->irq, netdev, NULL);
ibmveth_interrupt(netdev->irq, netdev);
netif_start_queue(netdev);
@@ -843,7 +843,7 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)
return 0;
}
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
{
struct net_device *netdev = dev_instance;
struct ibmveth_adapter *adapter = netdev->priv;
@@ -1303,7 +1303,7 @@ const char * buf, size_t count)
}
/* kick the interrupt handler to allocate/deallocate pools */
ibmveth_interrupt(netdev->irq, netdev, NULL);
ibmveth_interrupt(netdev->irq, netdev);
return count;
}