aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ucc_geth.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
commit4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch)
tree856ba96302a36014736747e8464f80eeb827bbdd /drivers/net/ucc_geth.h
parentf6c4c8195b5e7878823caa1181be404d9e86d369 (diff)
parentd014d043869cdc591f3a33243d3481fa4479c2d0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
Diffstat (limited to 'drivers/net/ucc_geth.h')
-rw-r--r--drivers/net/ucc_geth.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index 03a6ca016d5a..a007e2acf651 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -80,16 +80,16 @@ 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 succesfull 83 that where involved in successfull
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 */
87 u8 res4[0x2]; 87 u8 res4[0x2];
88 u32 tmca; /* Total number of frames that were transmitted 88 u32 tmca; /* Total number of frames that were transmitted
89 succesfully with the group address bit set 89 successfully with the group address bit set
90 that are not broadcast frames */ 90 that are not broadcast frames */
91 u32 tbca; /* Total number of frames transmitted 91 u32 tbca; /* Total number of frames transmitted
92 succesfully that had destination address 92 successfully that had destination address
93 field equal to the broadcast address */ 93 field equal to the broadcast address */
94 u32 rxfok; /* Total number of frames received OK */ 94 u32 rxfok; /* Total number of frames received OK */
95 u32 rxbok; /* Total number of octets received OK */ 95 u32 rxbok; /* Total number of octets received OK */
@@ -98,9 +98,9 @@ struct ucc_geth {
98 HW because it includes octets in frames that 98 HW because it includes octets in frames that
99 never even reach the UCC */ 99 never even reach the UCC */
100 u32 rmca; /* Total number of frames that were received 100 u32 rmca; /* Total number of frames that were received
101 succesfully with the group address bit set 101 successfully with the group address bit set
102 that are not broadcast frames */ 102 that are not broadcast frames */
103 u32 rbca; /* Total number of frames received succesfully 103 u32 rbca; /* Total number of frames received successfully
104 that had destination address equal to the 104 that had destination address equal to the
105 broadcast address */ 105 broadcast address */
106 u32 scar; /* Statistics carry register */ 106 u32 scar; /* Statistics carry register */
@@ -759,15 +759,15 @@ 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 succesfull 762 that where involved in successfull
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 */
766 u32 tmca; /* Total number of frames that were transmitted 766 u32 tmca; /* Total number of frames that were transmitted
767 succesfully with the group address bit set 767 successfully with the group address bit set
768 that are not broadcast frames */ 768 that are not broadcast frames */
769 u32 tbca; /* Total number of frames transmitted 769 u32 tbca; /* Total number of frames transmitted
770 succesfully that had destination address 770 successfully that had destination address
771 field equal to the broadcast address */ 771 field equal to the broadcast address */
772 u32 rxfok; /* Total number of frames received OK */ 772 u32 rxfok; /* Total number of frames received OK */
773 u32 rxbok; /* Total number of octets received OK */ 773 u32 rxbok; /* Total number of octets received OK */
@@ -776,9 +776,9 @@ struct ucc_geth_hardware_statistics {
776 HW because it includes octets in frames that 776 HW because it includes octets in frames that
777 never even reach the UCC */ 777 never even reach the UCC */
778 u32 rmca; /* Total number of frames that were received 778 u32 rmca; /* Total number of frames that were received
779 succesfully with the group address bit set 779 successfully with the group address bit set
780 that are not broadcast frames */ 780 that are not broadcast frames */
781 u32 rbca; /* Total number of frames received succesfully 781 u32 rbca; /* Total number of frames received successfully
782 that had destination address equal to the 782 that had destination address equal to the
783 broadcast address */ 783 broadcast address */
784} __attribute__ ((packed)); 784} __attribute__ ((packed));