diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:03:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 20:03:15 -0700 |
| commit | 618a821dc24a4018b0c5c01785d052459a90edb4 (patch) | |
| tree | 03f778b1afe89a4b733d1cdd0f34a648a4ff84bb /drivers/net/cxgb3/adapter.h | |
| parent | 5e7a39275b00ec881790ce47b8f7363fdfa097fa (diff) | |
| parent | 47330077650a25d417155848516b2cba97999602 (diff) | |
| download | op-kernel-dev-618a821dc24a4018b0c5c01785d052459a90edb4.zip op-kernel-dev-618a821dc24a4018b0c5c01785d052459a90edb4.tar.gz | |
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/adapter.h')
| -rw-r--r-- | drivers/net/cxgb3/adapter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index ab72563..20e887d 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h @@ -50,7 +50,9 @@ typedef irqreturn_t(*intr_handler_t) (int, void *); struct vlan_group; +struct adapter; struct port_info { + struct adapter *adapter; struct vlan_group *vlan_grp; const struct port_type_info *port_type; u8 port_id; |
