diff options
author | Barry Grussling <barry@grussling.com> | 2013-01-08 11:05:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-10 03:04:34 -0500 |
commit | 3675c8d7144e91d9a2a1f6f12e576cb92e06f352 (patch) | |
tree | fb113eb9c6445686b169f57f9bd18ba9f70a2416 /drivers/net/dsa/mv88e6060.c | |
parent | a0376db0f234a8053100bddf26c073be79546b2b (diff) |
DSA: Convert DSA comments to network-style comments
Convert DSA driver comments to network-style comments as reported by
checkpatch.pl. Fix spelling error.
Signed-off-by: Barry Grussling <barry@grussling.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6060.c')
-rw-r--r-- | drivers/net/dsa/mv88e6060.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 325391d19bad..637373cebf78 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c | |||
@@ -67,27 +67,19 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds) | |||
67 | int i; | 67 | int i; |
68 | int ret; | 68 | int ret; |
69 | 69 | ||
70 | /* | 70 | /* Set all ports to the disabled state. */ |
71 | * Set all ports to the disabled state. | ||
72 | */ | ||
73 | for (i = 0; i < 6; i++) { | 71 | for (i = 0; i < 6; i++) { |
74 | ret = REG_READ(REG_PORT(i), 0x04); | 72 | ret = REG_READ(REG_PORT(i), 0x04); |
75 | REG_WRITE(REG_PORT(i), 0x04, ret & 0xfffc); | 73 | REG_WRITE(REG_PORT(i), 0x04, ret & 0xfffc); |
76 | } | 74 | } |
77 | 75 | ||
78 | /* | 76 | /* Wait for transmit queues to drain. */ |
79 | * Wait for transmit queues to drain. | ||
80 | */ | ||
81 | msleep(2); | 77 | msleep(2); |
82 | 78 | ||
83 | /* | 79 | /* Reset the switch. */ |
84 | * Reset the switch. | ||
85 | */ | ||
86 | REG_WRITE(REG_GLOBAL, 0x0a, 0xa130); | 80 | REG_WRITE(REG_GLOBAL, 0x0a, 0xa130); |
87 | 81 | ||
88 | /* | 82 | /* Wait up to one second for reset to complete. */ |
89 | * Wait up to one second for reset to complete. | ||
90 | */ | ||
91 | for (i = 0; i < 1000; i++) { | 83 | for (i = 0; i < 1000; i++) { |
92 | ret = REG_READ(REG_GLOBAL, 0x00); | 84 | ret = REG_READ(REG_GLOBAL, 0x00); |
93 | if ((ret & 0x8000) == 0x0000) | 85 | if ((ret & 0x8000) == 0x0000) |
@@ -103,15 +95,13 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds) | |||
103 | 95 | ||
104 | static int mv88e6060_setup_global(struct dsa_switch *ds) | 96 | static int mv88e6060_setup_global(struct dsa_switch *ds) |
105 | { | 97 | { |
106 | /* | 98 | /* Disable discarding of frames with excessive collisions, |
107 | * Disable discarding of frames with excessive collisions, | ||
108 | * set the maximum frame size to 1536 bytes, and mask all | 99 | * set the maximum frame size to 1536 bytes, and mask all |
109 | * interrupt sources. | 100 | * interrupt sources. |
110 | */ | 101 | */ |
111 | REG_WRITE(REG_GLOBAL, 0x04, 0x0800); | 102 | REG_WRITE(REG_GLOBAL, 0x04, 0x0800); |
112 | 103 | ||
113 | /* | 104 | /* Enable automatic address learning, set the address |
114 | * Enable automatic address learning, set the address | ||
115 | * database size to 1024 entries, and set the default aging | 105 | * database size to 1024 entries, and set the default aging |
116 | * time to 5 minutes. | 106 | * time to 5 minutes. |
117 | */ | 107 | */ |
@@ -124,16 +114,14 @@ static int mv88e6060_setup_port(struct dsa_switch *ds, int p) | |||
124 | { | 114 | { |
125 | int addr = REG_PORT(p); | 115 | int addr = REG_PORT(p); |
126 | 116 | ||
127 | /* | 117 | /* Do not force flow control, disable Ingress and Egress |
128 | * Do not force flow control, disable Ingress and Egress | ||
129 | * Header tagging, disable VLAN tunneling, and set the port | 118 | * Header tagging, disable VLAN tunneling, and set the port |
130 | * state to Forwarding. Additionally, if this is the CPU | 119 | * state to Forwarding. Additionally, if this is the CPU |
131 | * port, enable Ingress and Egress Trailer tagging mode. | 120 | * port, enable Ingress and Egress Trailer tagging mode. |
132 | */ | 121 | */ |
133 | REG_WRITE(addr, 0x04, dsa_is_cpu_port(ds, p) ? 0x4103 : 0x0003); | 122 | REG_WRITE(addr, 0x04, dsa_is_cpu_port(ds, p) ? 0x4103 : 0x0003); |
134 | 123 | ||
135 | /* | 124 | /* Port based VLAN map: give each port its own address |
136 | * Port based VLAN map: give each port its own address | ||
137 | * database, allow the CPU port to talk to each of the 'real' | 125 | * database, allow the CPU port to talk to each of the 'real' |
138 | * ports, and allow each of the 'real' ports to only talk to | 126 | * ports, and allow each of the 'real' ports to only talk to |
139 | * the CPU port. | 127 | * the CPU port. |
@@ -144,8 +132,7 @@ static int mv88e6060_setup_port(struct dsa_switch *ds, int p) | |||
144 | ds->phys_port_mask : | 132 | ds->phys_port_mask : |
145 | (1 << ds->dst->cpu_port))); | 133 | (1 << ds->dst->cpu_port))); |
146 | 134 | ||
147 | /* | 135 | /* Port Association Vector: when learning source addresses |
148 | * Port Association Vector: when learning source addresses | ||
149 | * of packets, add the address to the address database using | 136 | * of packets, add the address to the address database using |
150 | * a port bitmap that has only the bit for this port set and | 137 | * a port bitmap that has only the bit for this port set and |
151 | * the other bits clear. | 138 | * the other bits clear. |