aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ipg.h
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2007-11-30 02:55:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:05:53 -0500
commit8da5bb7a274559737defa400a42461e1366fc30a (patch)
tree98e1d475333d488db96eb751d9ecd511df25a5b9 /drivers/net/ipg.h
parent9893ba16c8fb9c94729061a88bdee40ecf3a3899 (diff)
ipg: fix checkpatch reported errors
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Francois Romieu <romieu@fr.zoreil.com> Cc: Sorbica Shieh <sorbica@icplus.com.tw> Cc: Jesse Huang <jesse@icplus.com.tw>
Diffstat (limited to 'drivers/net/ipg.h')
-rw-r--r--drivers/net/ipg.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h
index 8b10d6333408..cda53887d4db 100644
--- a/drivers/net/ipg.h
+++ b/drivers/net/ipg.h
@@ -51,7 +51,7 @@
51/* I/O register offsets. */ 51/* I/O register offsets. */
52enum ipg_regs { 52enum ipg_regs {
53 DMA_CTRL = 0x00, 53 DMA_CTRL = 0x00,
54 RX_DMA_STATUS = 0x08, // Unused + reserved 54 RX_DMA_STATUS = 0x08, /* Unused + reserved */
55 TFD_LIST_PTR_0 = 0x10, 55 TFD_LIST_PTR_0 = 0x10,
56 TFD_LIST_PTR_1 = 0x14, 56 TFD_LIST_PTR_1 = 0x14,
57 TX_DMA_BURST_THRESH = 0x18, 57 TX_DMA_BURST_THRESH = 0x18,
@@ -64,21 +64,21 @@ enum ipg_regs {
64 RX_DMA_POLL_PERIOD = 0x26, 64 RX_DMA_POLL_PERIOD = 0x26,
65 DEBUG_CTRL = 0x2c, 65 DEBUG_CTRL = 0x2c,
66 ASIC_CTRL = 0x30, 66 ASIC_CTRL = 0x30,
67 FIFO_CTRL = 0x38, // Unused 67 FIFO_CTRL = 0x38, /* Unused */
68 FLOW_OFF_THRESH = 0x3c, 68 FLOW_OFF_THRESH = 0x3c,
69 FLOW_ON_THRESH = 0x3e, 69 FLOW_ON_THRESH = 0x3e,
70 EEPROM_DATA = 0x48, 70 EEPROM_DATA = 0x48,
71 EEPROM_CTRL = 0x4a, 71 EEPROM_CTRL = 0x4a,
72 EXPROM_ADDR = 0x4c, // Unused 72 EXPROM_ADDR = 0x4c, /* Unused */
73 EXPROM_DATA = 0x50, // Unused 73 EXPROM_DATA = 0x50, /* Unused */
74 WAKE_EVENT = 0x51, // Unused 74 WAKE_EVENT = 0x51, /* Unused */
75 COUNTDOWN = 0x54, // Unused 75 COUNTDOWN = 0x54, /* Unused */
76 INT_STATUS_ACK = 0x5a, 76 INT_STATUS_ACK = 0x5a,
77 INT_ENABLE = 0x5c, 77 INT_ENABLE = 0x5c,
78 INT_STATUS = 0x5e, // Unused 78 INT_STATUS = 0x5e, /* Unused */
79 TX_STATUS = 0x60, 79 TX_STATUS = 0x60,
80 MAC_CTRL = 0x6c, 80 MAC_CTRL = 0x6c,
81 VLAN_TAG = 0x70, // Unused 81 VLAN_TAG = 0x70, /* Unused */
82 PHY_SET = 0x75, 82 PHY_SET = 0x75,
83 PHY_CTRL = 0x76, 83 PHY_CTRL = 0x76,
84 STATION_ADDRESS_0 = 0x78, 84 STATION_ADDRESS_0 = 0x78,
@@ -90,11 +90,11 @@ enum ipg_regs {
90 HASHTABLE_1 = 0x90, 90 HASHTABLE_1 = 0x90,
91 RMON_STATISTICS_MASK = 0x98, 91 RMON_STATISTICS_MASK = 0x98,
92 STATISTICS_MASK = 0x9c, 92 STATISTICS_MASK = 0x9c,
93 RX_JUMBO_FRAMES = 0xbc, // Unused 93 RX_JUMBO_FRAMES = 0xbc, /* Unused */
94 TCP_CHECKSUM_ERRORS = 0xc0, // Unused 94 TCP_CHECKSUM_ERRORS = 0xc0, /* Unused */
95 IP_CHECKSUM_ERRORS = 0xc2, // Unused 95 IP_CHECKSUM_ERRORS = 0xc2, /* Unused */
96 UDP_CHECKSUM_ERRORS = 0xc4, // Unused 96 UDP_CHECKSUM_ERRORS = 0xc4, /* Unused */
97 TX_JUMBO_FRAMES = 0xf4 // Unused 97 TX_JUMBO_FRAMES = 0xf4 /* Unused */
98}; 98};
99 99
100/* Ethernet MIB statistic register offsets. */ 100/* Ethernet MIB statistic register offsets. */
@@ -590,7 +590,7 @@ enum ipg_regs {
590 * Define larger if expecting jumbo frames. 590 * Define larger if expecting jumbo frames.
591 */ 591 */
592#ifdef JUMBO_FRAME 592#ifdef JUMBO_FRAME
593//IPG_TXFRAG_SIZE must <= 0x2b00, or TX will crash 593/* IPG_TXFRAG_SIZE must <= 0x2b00, or TX will crash */
594#define IPG_TXFRAG_SIZE JUMBO_FRAME_SIZE 594#define IPG_TXFRAG_SIZE JUMBO_FRAME_SIZE
595#endif 595#endif
596 596
@@ -598,7 +598,7 @@ enum ipg_regs {
598 * Define larger if expecting jumbo frames. 598 * Define larger if expecting jumbo frames.
599 */ 599 */
600#ifdef JUMBO_FRAME 600#ifdef JUMBO_FRAME
601//4088=4096-8 601/* 4088 = 4096 - 8 */
602#define IPG_RXFRAG_SIZE __IPG_RXFRAG_SIZE 602#define IPG_RXFRAG_SIZE __IPG_RXFRAG_SIZE
603#define IPG_RXSUPPORT_SIZE IPG_MAX_RXFRAME_SIZE 603#define IPG_RXSUPPORT_SIZE IPG_MAX_RXFRAME_SIZE
604#else 604#else
@@ -628,7 +628,7 @@ enum ipg_regs {
628/* specify the jumbo frame maximum size 628/* specify the jumbo frame maximum size
629 * per unit is 0x600 (the rx_buffer size that one RFD can carry) 629 * per unit is 0x600 (the rx_buffer size that one RFD can carry)
630 */ 630 */
631#define MAX_JUMBOSIZE 0x8 // max is 12K 631#define MAX_JUMBOSIZE 0x8 /* max is 12K */
632 632
633/* Key register values loaded at driver start up. */ 633/* Key register values loaded at driver start up. */
634 634