diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 23:03:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 23:03:15 -0400 |
| commit | 618a821dc24a4018b0c5c01785d052459a90edb4 (patch) | |
| tree | 03f778b1afe89a4b733d1cdd0f34a648a4ff84bb /drivers/net/cxgb3/cxgb3_offload.h | |
| parent | 5e7a39275b00ec881790ce47b8f7363fdfa097fa (diff) | |
| parent | 47330077650a25d417155848516b2cba97999602 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
- cxgb3 engine microcode load
cxgb3 - Fix dev->priv usage
qeth: Drop ARP packages on HiperSockets interface with NOARP attribute.
qeth: provide specific message for OSA-adapters exclusively used
qeth: crash during reboot after failing online setting
qeth: Announce tx checksumming for qeth devices in TSO/EDDP mode
qeth: dont return the return values of void functions.
qeth: enforce a rate limit for inbound scatter gather messages
qeth: ungrouping a device must not be interruptible
netxen: fix crashes during module unload
netxen: Avoid firmware load in PCI probe
PS3: fix the bug that 'ifconfig down' would hang
IOC3: Program UART predividers.
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_offload.h')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_offload.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/cxgb3_offload.h b/drivers/net/cxgb3/cxgb3_offload.h index f15446a32efc..7a379138b5a6 100644 --- a/drivers/net/cxgb3/cxgb3_offload.h +++ b/drivers/net/cxgb3/cxgb3_offload.h | |||
| @@ -51,6 +51,8 @@ void cxgb3_offload_deactivate(struct adapter *adapter); | |||
| 51 | 51 | ||
| 52 | void cxgb3_set_dummy_ops(struct t3cdev *dev); | 52 | void cxgb3_set_dummy_ops(struct t3cdev *dev); |
| 53 | 53 | ||
| 54 | struct t3cdev *dev2t3cdev(struct net_device *dev); | ||
| 55 | |||
| 54 | /* | 56 | /* |
| 55 | * Client registration. Users of T3 driver must register themselves. | 57 | * Client registration. Users of T3 driver must register themselves. |
| 56 | * The T3 driver will call the add function of every client for each T3 | 58 | * The T3 driver will call the add function of every client for each T3 |