diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-11 15:40:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-11 15:40:45 -0700 |
| commit | 73aba63c5d62f4f504c6469c7c56311a0c818b20 (patch) | |
| tree | ed8b7ffb76b26b5d799e1182e1f14a48390eddf7 /drivers/net/cxgb3/common.h | |
| parent | 29ac8cabd225eaccb2918846f2f2f4e4d99030bd (diff) | |
| parent | cec34dda71bd8bb1df61579d6a1440723baec9f7 (diff) | |
| download | kernel-crypto-73aba63c5d62f4f504c6469c7c56311a0c818b20.tar.gz kernel-crypto-73aba63c5d62f4f504c6469c7c56311a0c818b20.tar.xz kernel-crypto-73aba63c5d62f4f504c6469c7c56311a0c818b20.zip | |
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:
myri10ge: update driver version to 1.3.0-1.233
myri10ge: more Intel chipsets providing aligned PCIe completions
myri10ge: fix management of the firmware 4KB boundary crossing restriction
cxgb3 - missing CPL hanler and register setting.
cxgb3 - MAC watchdog update
cxgb3 - avoid deadlock with mac watchdog
skge: fix wake on lan
sky2: phy workarounds for Yukon EC-U A1
sky2: turn on clocks when doing resume
sky2: turn carrier off when down
skge: turn carrier off when down
[PATCH] bcm43xx: Fix PPC machine checks and match loopback gain specs
[PATCH] bcm43xx: Fix 802.11b/g scan limits to match regulatory reqs
[PATCH] zd1211rw: Fix E2P_PHY_REG patching
[PATCH] zd1211rw: Reject AL2230S devices
Diffstat (limited to 'drivers/net/cxgb3/common.h')
| -rw-r--r-- | drivers/net/cxgb3/common.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h index 97128d88eae..8d137963369 100644 --- a/drivers/net/cxgb3/common.h +++ b/drivers/net/cxgb3/common.h @@ -478,8 +478,11 @@ struct cmac { struct adapter *adapter; unsigned int offset; unsigned int nucast; /* # of address filters for unicast MACs */ - unsigned int tcnt; - unsigned int xcnt; + unsigned int tx_tcnt; + unsigned int tx_xcnt; + u64 tx_mcnt; + unsigned int rx_xcnt; + u64 rx_mcnt; unsigned int toggle_cnt; unsigned int txen; struct mac_stats stats; |