diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/ucc_geth.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/ucc_geth.h')
| -rw-r--r-- | drivers/net/ucc_geth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 055b87ab4f07..d12fcad145e9 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
| @@ -80,7 +80,7 @@ struct ucc_geth { | |||
| 80 | frames) received that were between 128 | 80 | frames) received that were between 128 |
| 81 | (Including FCS length==4) and 255 octets */ | 81 | (Including FCS length==4) and 255 octets */ |
| 82 | u32 txok; /* Total number of octets residing in frames | 82 | u32 txok; /* Total number of octets residing in frames |
| 83 | that where involved in successfull | 83 | that where involved in successful |
| 84 | transmission */ | 84 | transmission */ |
| 85 | u16 txcf; /* Total number of PAUSE control frames | 85 | u16 txcf; /* Total number of PAUSE control frames |
| 86 | transmitted by this MAC */ | 86 | transmitted by this MAC */ |
| @@ -759,7 +759,7 @@ struct ucc_geth_hardware_statistics { | |||
| 759 | frames) received that were between 128 | 759 | frames) received that were between 128 |
| 760 | (Including FCS length==4) and 255 octets */ | 760 | (Including FCS length==4) and 255 octets */ |
| 761 | u32 txok; /* Total number of octets residing in frames | 761 | u32 txok; /* Total number of octets residing in frames |
| 762 | that where involved in successfull | 762 | that where involved in successful |
| 763 | transmission */ | 763 | transmission */ |
| 764 | u16 txcf; /* Total number of PAUSE control frames | 764 | u16 txcf; /* Total number of PAUSE control frames |
| 765 | transmitted by this MAC */ | 765 | transmitted by this MAC */ |