?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Dash:
[t2.git] / architecture / mips64 / package / linux / 5116_ioc3eth-cleanup.patch
blobfd950e4c015f3fa3b110769dd5468b2fdff40ed2
1 diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
2 index b58c89fdc348..e5d68cba4766 100644
3 --- a/drivers/net/ethernet/sgi/ioc3-eth.c
4 +++ b/drivers/net/ethernet/sgi/ioc3-eth.c
5 @@ -66,13 +66,13 @@
6 #include <asm/pci/bridge.h>
7
8 /*
9 - * 64 RX buffers. This is tunable in the range of 16 <= x < 512. The
10 - * value must be a power of two.
11 + * 64 RX buffers. This is tunable in the range of 16 <= x < 512.
12 + * The value must be a power of two.
13 */
14 #define RX_BUFFS 64
15
16 -#define ETCSR_FD ((17<<ETCSR_IPGR2_SHIFT) | (11<<ETCSR_IPGR1_SHIFT) | 21)
17 -#define ETCSR_HD ((21<<ETCSR_IPGR2_SHIFT) | (21<<ETCSR_IPGR1_SHIFT) | 21)
18 +#define ETCSR_FD ((17 << ETCSR_IPGR2_SHIFT) | (11 << ETCSR_IPGR1_SHIFT) | 21)
19 +#define ETCSR_HD ((21 << ETCSR_IPGR2_SHIFT) | (21 << ETCSR_IPGR1_SHIFT) | 21)
20
21 /* Private per NIC data of the driver. */
22 struct ioc3_private {
23 @@ -101,7 +101,7 @@ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
24 static void ioc3_set_multicast_list(struct net_device *dev);
25 static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev);
26 static void ioc3_timeout(struct net_device *dev);
27 -static inline unsigned int ioc3_hash(const unsigned char *addr);
28 +static inline u32 ioc3_hash(const u8 *addr);
29 static inline void ioc3_stop(struct ioc3_private *ip);
30 static void ioc3_init(struct net_device *dev);
31
32 @@ -112,13 +112,14 @@ static const struct ethtool_ops ioc3_ethtool_ops;
33
34 #define IOC3_CACHELINE 128UL
35
36 -static inline unsigned long aligned_rx_skb_addr(unsigned long addr)
37 +static inline unsigned long
38 +aligned_rx_skb_addr(unsigned long addr)
39 {
40 return (~addr + 1) & (IOC3_CACHELINE - 1UL);
41 }
42
43 -static inline struct sk_buff * ioc3_alloc_skb(unsigned long length,
44 - unsigned int gfp_mask)
45 +static inline struct sk_buff *
46 +ioc3_alloc_skb(unsigned long length, u32 gfp_mask)
47 {
48 struct sk_buff *skb;
49
50 @@ -132,7 +133,8 @@ static inline struct sk_buff * ioc3_alloc_skb(unsigned long length,
51 return skb;
52 }
53
54 -static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)
55 +static inline unsigned long
56 +ioc3_map(void *ptr, unsigned long vdev)
57 {
58 #ifdef CONFIG_SGI_IP27
59 vdev <<= 57; /* Shift to PCI64_ATTR_VIRTUAL */
60 @@ -145,7 +147,8 @@ static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)
61 }
62
63 /* BEWARE: The IOC3 documentation documents the size of rx buffers as
64 - 1644 while it's actually 1664. This one was nasty to track down ... */
65 + * 1644 while it's actually 1664. This one was nasty to track down...
66 + */
67 #define RX_OFFSET 10
68 #define RX_BUF_ALLOC_SIZE (1664 + RX_OFFSET + IOC3_CACHELINE)
69
70 @@ -156,8 +159,7 @@ static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)
71
72 #define IOC3_SIZE 0x100000
73
74 -/*
75 - * IOC3 is a big endian device
76 +/* IOC3 is a big endian device
77 *
78 * Unorthodox but makes the users of these macros more readable - the pointer
79 * to the IOC3's memory mapped registers is expected as struct ioc3 * ioc3
80 @@ -217,25 +219,28 @@ static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)
81 #define ioc3_r_midr_w() be32_to_cpu(ioc3->midr_w)
82 #define ioc3_w_midr_w(v) do { ioc3->midr_w = cpu_to_be32(v); } while (0)
83
84 -static inline u32 mcr_pack(u32 pulse, u32 sample)
85 +static inline u32
86 +mcr_pack(u32 pulse, u32 sample)
87 {
88 return (pulse << 10) | (sample << 2);
89 }
90
91 -static int nic_wait(struct ioc3 *ioc3)
92 +static int
93 +nic_wait(struct ioc3 *ioc3)
94 {
95 u32 mcr;
96
97 - do {
98 - mcr = ioc3_r_mcr();
99 - } while (!(mcr & 2));
100 + do {
101 + mcr = ioc3_r_mcr();
102 + } while (!(mcr & 2));
103
104 - return mcr & 1;
105 + return mcr & 1;
106 }
107
108 -static int nic_reset(struct ioc3 *ioc3)
109 +static int
110 +nic_reset(struct ioc3 *ioc3)
111 {
112 - int presence;
113 + int presence;
114
115 ioc3_w_mcr(mcr_pack(500, 65));
116 presence = nic_wait(ioc3);
117 @@ -243,10 +248,11 @@ static int nic_reset(struct ioc3 *ioc3)
118 ioc3_w_mcr(mcr_pack(0, 500));
119 nic_wait(ioc3);
120
121 - return presence;
122 + return presence;
123 }
124
125 -static inline int nic_read_bit(struct ioc3 *ioc3)
126 +static inline
127 +int nic_read_bit(struct ioc3 *ioc3)
128 {
129 int result;
130
131 @@ -258,7 +264,8 @@ static inline int nic_read_bit(struct ioc3 *ioc3)
132 return result;
133 }
134
135 -static inline void nic_write_bit(struct ioc3 *ioc3, int bit)
136 +static inline void
137 +nic_write_bit(struct ioc3 *ioc3, int bit)
138 {
139 if (bit)
140 ioc3_w_mcr(mcr_pack(6, 110));
141 @@ -271,7 +278,8 @@ static inline void nic_write_bit(struct ioc3 *ioc3, int bit)
142 /*
143 * Read a byte from an iButton device
144 */
145 -static u32 nic_read_byte(struct ioc3 *ioc3)
146 +static u32
147 +nic_read_byte(struct ioc3 *ioc3)
148 {
149 u32 result = 0;
150 int i;
151 @@ -285,7 +293,8 @@ static u32 nic_read_byte(struct ioc3 *ioc3)
152 /*
153 * Write a byte to an iButton device
154 */
155 -static void nic_write_byte(struct ioc3 *ioc3, int byte)
156 +static void
157 +nic_write_byte(struct ioc3 *ioc3, int byte)
158 {
159 int i, bit;
160
161 @@ -297,7 +306,8 @@ static void nic_write_byte(struct ioc3 *ioc3, int byte)
162 }
163 }
164
165 -static u64 nic_find(struct ioc3 *ioc3, int *last)
166 +static u64
167 +nic_find(struct ioc3 *ioc3, int *last)
168 {
169 int a, b, index, disc;
170 u64 address = 0;
171 @@ -342,7 +352,8 @@ static u64 nic_find(struct ioc3 *ioc3, int *last)
172 return address;
173 }
174
175 -static int nic_init(struct ioc3 *ioc3)
176 +static int
177 +nic_init(struct ioc3 *ioc3)
178 {
179 const char *unknown = "unknown";
180 const char *type = unknown;
181 @@ -360,7 +371,7 @@ static int nic_init(struct ioc3 *ioc3)
182 break;
183 default:
184 if (save == 0) {
185 - /* Let the caller try again. */
186 + /* Let the caller try again. */
187 return -1;
188 }
189 continue;
190 @@ -394,7 +405,8 @@ static int nic_init(struct ioc3 *ioc3)
191 * Read the NIC (Number-In-a-Can) device used to store the MAC address on
192 * SN0 / SN00 nodeboards and PCI cards.
193 */
194 -static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
195 +static void
196 +ioc3_get_eaddr_nic(struct ioc3_private *ip)
197 {
198 struct ioc3 *ioc3 = ip->regs;
199 u8 nic[14];
200 @@ -431,24 +443,27 @@ static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
201 * NIC is in in order to know how to read the NIC address. We also have
202 * to know if it's a PCI card or a NIC in on the node board ...
203 */
204 -static void ioc3_get_eaddr(struct ioc3_private *ip)
205 +static void
206 +ioc3_get_eaddr(struct ioc3_private *ip)
207 {
208 ioc3_get_eaddr_nic(ip);
209
210 printk("Ethernet address is %pM.\n", ip->dev->dev_addr);
211 }
212
213 -static void __ioc3_set_mac_address(struct net_device *dev)
214 +static void
215 +__ioc3_set_mac_address(struct net_device *dev)
216 {
217 struct ioc3_private *ip = netdev_priv(dev);
218 struct ioc3 *ioc3 = ip->regs;
219
220 ioc3_w_emar_h((dev->dev_addr[5] << 8) | dev->dev_addr[4]);
221 ioc3_w_emar_l((dev->dev_addr[3] << 24) | (dev->dev_addr[2] << 16) |
222 - (dev->dev_addr[1] << 8) | dev->dev_addr[0]);
223 + (dev->dev_addr[1] << 8) | dev->dev_addr[0]);
224 }
225
226 -static int ioc3_set_mac_address(struct net_device *dev, void *addr)
227 +static int
228 +ioc3_set_mac_address(struct net_device *dev, void *addr)
229 {
230 struct ioc3_private *ip = netdev_priv(dev);
231 struct sockaddr *sa = addr;
232 @@ -466,7 +481,8 @@ static int ioc3_set_mac_address(struct net_device *dev, void *addr)
233 * Caller must hold the ioc3_lock ever for MII readers. This is also
234 * used to protect the transmitter side but it's low contention.
235 */
236 -static int ioc3_mdio_read(struct net_device *dev, int phy, int reg)
237 +static int
238 +ioc3_mdio_read(struct net_device *dev, int phy, int reg)
239 {
240 struct ioc3_private *ip = netdev_priv(dev);
241 struct ioc3 *ioc3 = ip->regs;
242 @@ -478,7 +494,8 @@ static int ioc3_mdio_read(struct net_device *dev, int phy, int reg)
243 return ioc3_r_midr_r() & MIDR_DATA_MASK;
244 }
245
246 -static void ioc3_mdio_write(struct net_device *dev, int phy, int reg, int data)
247 +static void
248 +ioc3_mdio_write(struct net_device *dev, int phy, int reg, int data)
249 {
250 struct ioc3_private *ip = netdev_priv(dev);
251 struct ioc3 *ioc3 = ip->regs;
252 @@ -489,9 +506,11 @@ static void ioc3_mdio_write(struct net_device *dev, int phy, int reg, int data)
253 while (ioc3_r_micr() & MICR_BUSY);
254 }
255
256 -static int ioc3_mii_init(struct ioc3_private *ip);
257 +static int
258 +ioc3_mii_init(struct ioc3_private *ip);
259
260 -static struct net_device_stats *ioc3_get_stats(struct net_device *dev)
261 +static struct net_device_stats *
262 +ioc3_get_stats(struct net_device *dev)
263 {
264 struct ioc3_private *ip = netdev_priv(dev);
265 struct ioc3 *ioc3 = ip->regs;
266 @@ -500,14 +519,14 @@ static struct net_device_stats *ioc3_get_stats(struct net_device *dev)
267 return &dev->stats;
268 }
269
270 -static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
271 +static void
272 +ioc3_tcpudp_checksum(struct sk_buff *skb, u32 hwsum, int len)
273 {
274 struct ethhdr *eh = eth_hdr(skb);
275 - uint32_t csum, ehsum;
276 - unsigned int proto;
277 + u32 csum, ehsum, proto;
278 struct iphdr *ih;
279 - uint16_t *ew;
280 - unsigned char *cp;
281 + u16 *ew;
282 + u8 *cp;
283
284 /*
285 * Did hardware handle the checksum at all? The cases we can handle
286 @@ -537,12 +556,12 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
287 /* Same as tx - compute csum of pseudo header */
288 csum = hwsum +
289 (ih->tot_len - (ih->ihl << 2)) +
290 - htons((uint16_t)ih->protocol) +
291 + htons((u16)ih->protocol) +
292 (ih->saddr >> 16) + (ih->saddr & 0xffff) +
293 (ih->daddr >> 16) + (ih->daddr & 0xffff);
294
295 /* Sum up ethernet dest addr, src addr and protocol */
296 - ew = (uint16_t *) eh;
297 + ew = (u16 *)eh;
298 ehsum = ew[0] + ew[1] + ew[2] + ew[3] + ew[4] + ew[5] + ew[6];
299
300 ehsum = (ehsum & 0xffff) + (ehsum >> 16);
301 @@ -554,11 +573,11 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
302 checksum of the trailing ethernet CRC. */
303 cp = (char *)eh + len; /* points at trailing CRC */
304 if (len & 1) {
305 - csum += 0xffff ^ (uint16_t) ((cp[1] << 8) | cp[0]);
306 - csum += 0xffff ^ (uint16_t) ((cp[3] << 8) | cp[2]);
307 + csum += 0xffff ^ (u16)((cp[1] << 8) | cp[0]);
308 + csum += 0xffff ^ (u16)((cp[3] << 8) | cp[2]);
309 } else {
310 - csum += 0xffff ^ (uint16_t) ((cp[0] << 8) | cp[1]);
311 - csum += 0xffff ^ (uint16_t) ((cp[2] << 8) | cp[3]);
312 + csum += 0xffff ^ (u16)((cp[0] << 8) | cp[1]);
313 + csum += 0xffff ^ (u16)((cp[2] << 8) | cp[3]);
314 }
315
316 csum = (csum & 0xffff) + (csum >> 16);
317 @@ -568,7 +587,8 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
318 skb->ip_summed = CHECKSUM_UNNECESSARY;
319 }
320
321 -static inline void ioc3_rx(struct net_device *dev)
322 +static inline void
323 +ioc3_rx(struct net_device *dev)
324 {
325 struct ioc3_private *ip = netdev_priv(dev);
326 struct sk_buff *skb, *new_skb;
327 @@ -578,8 +598,8 @@ static inline void ioc3_rx(struct net_device *dev)
328 unsigned long *rxr;
329 u32 w0, err;
330
331 - rxr = ip->rxr; /* Ring base */
332 - rx_entry = ip->rx_ci; /* RX consume index */
333 + rxr = ip->rxr; /* Ring base */
334 + rx_entry = ip->rx_ci; /* RX consume index */
335 n_entry = ip->rx_pi;
336
337 skb = ip->rx_skbs[rx_entry];
338 @@ -587,7 +607,7 @@ static inline void ioc3_rx(struct net_device *dev)
339 w0 = be32_to_cpu(rxb->w0);
340
341 while (w0 & ERXBUF_V) {
342 - err = be32_to_cpu(rxb->err); /* It's valid ... */
343 + err = be32_to_cpu(rxb->err); /* It's valid */
344 if (err & ERXBUF_GOODPKT) {
345 len = ((w0 >> ERXBUF_BYTECNT_SHIFT) & 0x7ff) - 4;
346 skb_trim(skb, len);
347 @@ -596,7 +616,8 @@ static inline void ioc3_rx(struct net_device *dev)
348 new_skb = ioc3_alloc_skb(RX_BUF_ALLOC_SIZE, GFP_ATOMIC);
349 if (!new_skb) {
350 /* Ouch, drop packet and just recycle packet
351 - to keep the ring filled. */
352 + * to keep the ring filled.
353 + */
354 dev->stats.rx_dropped++;
355 new_skb = skb;
356 goto next;
357 @@ -612,19 +633,21 @@ static inline void ioc3_rx(struct net_device *dev)
358
359 /* Because we reserve afterwards. */
360 skb_put(new_skb, (1664 + RX_OFFSET));
361 - rxb = (struct ioc3_erxbuf *) new_skb->data;
362 + rxb = (struct ioc3_erxbuf *)new_skb->data;
363 skb_reserve(new_skb, RX_OFFSET);
364
365 - dev->stats.rx_packets++; /* Statistics */
366 + dev->stats.rx_packets++; /* Statistics */
367 dev->stats.rx_bytes += len;
368 } else {
369 - /* The frame is invalid and the skb never
370 - reached the network layer so we can just
371 - recycle it. */
372 + /* The frame is invalid and the skb never reached the
373 + * network layer so we can just recycle it.
374 + */
375 new_skb = skb;
376 dev->stats.rx_errors++;
377 }
378 - if (err & ERXBUF_CRCERR) /* Statistics */
379 +
380 + /* Statistics */
381 + if (err & ERXBUF_CRCERR)
382 dev->stats.rx_crc_errors++;
383 if (err & ERXBUF_FRAMERR)
384 dev->stats.rx_frame_errors++;
385 @@ -632,10 +655,10 @@ static inline void ioc3_rx(struct net_device *dev)
386 ip->rx_skbs[n_entry] = new_skb;
387 rxr[n_entry] = cpu_to_be64(ioc3_map(rxb, 1));
388 rxb->w0 = 0; /* Clear valid flag */
389 - n_entry = (n_entry + 1) & 511; /* Update erpir */
390 + n_entry = (n_entry + 1) & 0x1ff; /* Update erpir */
391
392 - /* Now go on to the next ring entry. */
393 - rx_entry = (rx_entry + 1) & 511;
394 + /* Now go on to the next ring entry. */
395 + rx_entry = (rx_entry + 1) & 0x1ff;
396 skb = ip->rx_skbs[rx_entry];
397 rxb = (struct ioc3_erxbuf *) (skb->data - RX_OFFSET);
398 w0 = be32_to_cpu(rxb->w0);
399 @@ -645,7 +668,8 @@ static inline void ioc3_rx(struct net_device *dev)
400 ip->rx_ci = rx_entry;
401 }
402
403 -static inline void ioc3_tx(struct net_device *dev)
404 +static inline void
405 +ioc3_tx(struct net_device *dev)
406 {
407 struct ioc3_private *ip = netdev_priv(dev);
408 unsigned long packets, bytes;
409 @@ -657,7 +681,7 @@ static inline void ioc3_tx(struct net_device *dev)
410 spin_lock(&ip->ioc3_lock);
411 etcir = ioc3_r_etcir();
412
413 - tx_entry = (etcir >> 7) & 127;
414 + tx_entry = (etcir >> 7) & 0x7f;
415 o_entry = ip->tx_ci;
416 packets = 0;
417 bytes = 0;
418 @@ -669,10 +693,10 @@ static inline void ioc3_tx(struct net_device *dev)
419 dev_kfree_skb_irq(skb);
420 ip->tx_skbs[o_entry] = NULL;
421
422 - o_entry = (o_entry + 1) & 127; /* Next */
423 + o_entry = (o_entry + 1) & 0x7f; /* Next */
424
425 etcir = ioc3_r_etcir(); /* More pkts sent? */
426 - tx_entry = (etcir >> 7) & 127;
427 + tx_entry = (etcir >> 7) & 0x7f;
428 }
429
430 dev->stats.tx_packets += packets;
431 @@ -693,10 +717,11 @@ static inline void ioc3_tx(struct net_device *dev)
432 * with such error interrupts if something really goes wrong, so we might
433 * also consider to take the interface down.
434 */
435 -static void ioc3_error(struct net_device *dev, u32 eisr)
436 +static void
437 +ioc3_error(struct net_device *dev, u32 eisr)
438 {
439 struct ioc3_private *ip = netdev_priv(dev);
440 - unsigned char *iface = dev->name;
441 + u8 *iface = dev->name;
442
443 spin_lock(&ip->ioc3_lock);
444
445 @@ -722,25 +747,27 @@ static void ioc3_error(struct net_device *dev, u32 eisr)
446 spin_unlock(&ip->ioc3_lock);
447 }
448
449 -/* The interrupt handler does all of the Rx thread work and cleans up
450 - after the Tx thread. */
451 -static irqreturn_t ioc3_interrupt(int irq, void *_dev)
452 +/* The interrupt handler does all of the Rx thread work and cleans up after
453 + * the Tx thread.
454 + */
455 +static irqreturn_t
456 +ioc3_interrupt(int irq, void *_dev)
457 {
458 struct net_device *dev = (struct net_device *)_dev;
459 struct ioc3_private *ip = netdev_priv(dev);
460 struct ioc3 *ioc3 = ip->regs;
461 const u32 enabled = EISR_RXTIMERINT | EISR_RXOFLO | EISR_RXBUFOFLO |
462 - EISR_RXMEMERR | EISR_RXPARERR | EISR_TXBUFUFLO |
463 - EISR_TXEXPLICIT | EISR_TXMEMERR;
464 + EISR_RXMEMERR | EISR_RXPARERR | EISR_TXBUFUFLO |
465 + EISR_TXEXPLICIT | EISR_TXMEMERR;
466 u32 eisr;
467
468 eisr = ioc3_r_eisr() & enabled;
469
470 ioc3_w_eisr(eisr);
471 - (void) ioc3_r_eisr(); /* Flush */
472 + (void)ioc3_r_eisr(); /* Flush */
473
474 if (eisr & (EISR_RXOFLO | EISR_RXBUFOFLO | EISR_RXMEMERR |
475 - EISR_RXPARERR | EISR_TXBUFUFLO | EISR_TXMEMERR))
476 + EISR_RXPARERR | EISR_TXBUFUFLO | EISR_TXMEMERR))
477 ioc3_error(dev, eisr);
478 if (eisr & EISR_RXTIMERINT)
479 ioc3_rx(dev);
480 @@ -750,7 +777,8 @@ static irqreturn_t ioc3_interrupt(int irq, void *_dev)
481 return IRQ_HANDLED;
482 }
483
484 -static inline void ioc3_setup_duplex(struct ioc3_private *ip)
485 +static inline void
486 +ioc3_setup_duplex(struct ioc3_private *ip)
487 {
488 struct ioc3 *ioc3 = ip->regs;
489
490 @@ -764,7 +792,8 @@ static inline void ioc3_setup_duplex(struct ioc3_private *ip)
491 ioc3_w_emcr(ip->emcr);
492 }
493
494 -static void ioc3_timer(struct timer_list *t)
495 +static void
496 +ioc3_timer(struct timer_list *t)
497 {
498 struct ioc3_private *ip = from_timer(ip, t, ioc3_timer);
499
500 @@ -772,7 +801,7 @@ static void ioc3_timer(struct timer_list *t)
501 mii_check_media(&ip->mii, 1, 0);
502 ioc3_setup_duplex(ip);
503
504 - ip->ioc3_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2s */
505 + ip->ioc3_timer.expires = jiffies + ((12 * HZ) / 10); /* 1.2s */
506 add_timer(&ip->ioc3_timer);
507 }
508
509 @@ -784,7 +813,8 @@ static void ioc3_timer(struct timer_list *t)
510 * yet the interface seems to work fine, so if probing fails we for now will
511 * simply default to PHY 31 instead of bailing out.
512 */
513 -static int ioc3_mii_init(struct ioc3_private *ip)
514 +static int
515 +ioc3_mii_init(struct ioc3_private *ip)
516 {
517 int i, found = 0, res = 0;
518 int ioc3_phy_workaround = 1;
519 @@ -795,7 +825,7 @@ static int ioc3_mii_init(struct ioc3_private *ip)
520
521 if (word != 0xffff && word != 0x0000) {
522 found = 1;
523 - break; /* Found a PHY */
524 + break; /* Found a PHY */
525 }
526 }
527
528 @@ -815,13 +845,15 @@ static int ioc3_mii_init(struct ioc3_private *ip)
529 return res;
530 }
531
532 -static void ioc3_mii_start(struct ioc3_private *ip)
533 +static void
534 +ioc3_mii_start(struct ioc3_private *ip)
535 {
536 - ip->ioc3_timer.expires = jiffies + (12 * HZ)/10; /* 1.2 sec. */
537 + ip->ioc3_timer.expires = jiffies + (12 * HZ) / 10; /* 1.2 sec. */
538 add_timer(&ip->ioc3_timer);
539 }
540
541 -static inline void ioc3_clean_rx_ring(struct ioc3_private *ip)
542 +static inline void
543 +ioc3_clean_rx_ring(struct ioc3_private *ip)
544 {
545 struct sk_buff *skb;
546 int i;
547 @@ -830,10 +862,10 @@ static inline void ioc3_clean_rx_ring(struct ioc3_private *ip)
548 ip->rx_skbs[ip->rx_pi] = ip->rx_skbs[ip->rx_ci];
549 ip->rxr[ip->rx_pi++] = ip->rxr[ip->rx_ci++];
550 }
551 - ip->rx_pi &= 511;
552 - ip->rx_ci &= 511;
553 + ip->rx_pi &= 0x1ff;
554 + ip->rx_ci &= 0x1ff;
555
556 - for (i = ip->rx_ci; i != ip->rx_pi; i = (i+1) & 511) {
557 + for (i = ip->rx_ci; i != ip->rx_pi; i = (i + 1) & 0x1ff) {
558 struct ioc3_erxbuf *rxb;
559 skb = ip->rx_skbs[i];
560 rxb = (struct ioc3_erxbuf *) (skb->data - RX_OFFSET);
561 @@ -841,7 +873,8 @@ static inline void ioc3_clean_rx_ring(struct ioc3_private *ip)
562 }
563 }
564
565 -static inline void ioc3_clean_tx_ring(struct ioc3_private *ip)
566 +static inline void
567 +ioc3_clean_tx_ring(struct ioc3_private *ip)
568 {
569 struct sk_buff *skb;
570 int i;
571 @@ -858,7 +891,8 @@ static inline void ioc3_clean_tx_ring(struct ioc3_private *ip)
572 ip->tx_ci = 0;
573 }
574
575 -static void ioc3_free_rings(struct ioc3_private *ip)
576 +static void
577 +ioc3_free_rings(struct ioc3_private *ip)
578 {
579 struct sk_buff *skb;
580 int rx_entry, n_entry;
581 @@ -878,14 +912,15 @@ static void ioc3_free_rings(struct ioc3_private *ip)
582 if (skb)
583 dev_kfree_skb_any(skb);
584
585 - n_entry = (n_entry + 1) & 511;
586 + n_entry = (n_entry + 1) & 0x1ff;
587 }
588 free_page((unsigned long)ip->rxr);
589 ip->rxr = NULL;
590 }
591 }
592
593 -static void ioc3_alloc_rings(struct net_device *dev)
594 +static void
595 +ioc3_alloc_rings(struct net_device *dev)
596 {
597 struct ioc3_private *ip = netdev_priv(dev);
598 struct ioc3_erxbuf *rxb;
599 @@ -899,9 +934,10 @@ static void ioc3_alloc_rings(struct net_device *dev)
600 if (!rxr)
601 printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n");
602
603 - /* Now the rx buffers. The RX ring may be larger but
604 - we only allocate 16 buffers for now. Need to tune
605 - this for performance and memory later. */
606 + /* Now the rx buffers. The RX ring may be larger but we only
607 + * allocate 16 buffers for now. Need to tune this for
608 + * performance and memory later.
609 + */
610 for (i = 0; i < RX_BUFFS; i++) {
611 struct sk_buff *skb;
612
613 @@ -933,7 +969,8 @@ static void ioc3_alloc_rings(struct net_device *dev)
614 }
615 }
616
617 -static void ioc3_init_rings(struct net_device *dev)
618 +static void
619 +ioc3_init_rings(struct net_device *dev)
620 {
621 struct ioc3_private *ip = netdev_priv(dev);
622 struct ioc3 *ioc3 = ip->regs;
623 @@ -954,22 +991,23 @@ static void ioc3_init_rings(struct net_device *dev)
624
625 ring = ioc3_map(ip->txr, 0);
626
627 - ip->txqlen = 0; /* nothing queued */
628 + ip->txqlen = 0; /* nothing queued */
629
630 /* Now the tx ring base, consume & produce registers. */
631 ioc3_w_etbr_h(ring >> 32);
632 ioc3_w_etbr_l(ring & 0xffffffff);
633 ioc3_w_etpir(ip->tx_pi << 7);
634 ioc3_w_etcir(ip->tx_ci << 7);
635 - (void) ioc3_r_etcir(); /* Flush */
636 + (void)ioc3_r_etcir(); /* Flush */
637 }
638
639 -static inline void ioc3_ssram_disc(struct ioc3_private *ip)
640 +static inline void
641 +ioc3_ssram_disc(struct ioc3_private *ip)
642 {
643 struct ioc3 *ioc3 = ip->regs;
644 volatile u32 *ssram0 = &ioc3->ssram[0x0000];
645 volatile u32 *ssram1 = &ioc3->ssram[0x4000];
646 - unsigned int pattern = 0x5555;
647 + u32 pattern = 0x5555;
648
649 /* Assume the larger size SSRAM and enable parity checking */
650 ioc3_w_emcr(ioc3_r_emcr() | (EMCR_BUFSIZ | EMCR_RAMPAR));
651 @@ -986,18 +1024,19 @@ static inline void ioc3_ssram_disc(struct ioc3_private *ip)
652 ip->emcr = EMCR_BUFSIZ | EMCR_RAMPAR;
653 }
654
655 -static void ioc3_init(struct net_device *dev)
656 +static void
657 +ioc3_init(struct net_device *dev)
658 {
659 struct ioc3_private *ip = netdev_priv(dev);
660 struct ioc3 *ioc3 = ip->regs;
661
662 - del_timer_sync(&ip->ioc3_timer); /* Kill if running */
663 + del_timer_sync(&ip->ioc3_timer); /* Kill if running */
664
665 - ioc3_w_emcr(EMCR_RST); /* Reset */
666 - (void) ioc3_r_emcr(); /* Flush WB */
667 - udelay(4); /* Give it time ... */
668 + ioc3_w_emcr(EMCR_RST); /* Reset */
669 + (void)ioc3_r_emcr(); /* Flush WB */
670 + udelay(4); /* Give it time... */
671 ioc3_w_emcr(0);
672 - (void) ioc3_r_emcr();
673 + (void)ioc3_r_emcr();
674
675 /* Misc registers */
676 #ifdef CONFIG_SGI_IP27
677 @@ -1005,7 +1044,7 @@ static void ioc3_init(struct net_device *dev)
678 #else
679 ioc3_w_erbar(0); /* Let PCI API get it right */
680 #endif
681 - (void) ioc3_r_etcdc(); /* Clear on read */
682 + (void)ioc3_r_etcdc(); /* Clear on read */
683 ioc3_w_ercsr(15); /* RX low watermark */
684 ioc3_w_ertr(0); /* Interrupt immediately */
685 __ioc3_set_mac_address(dev);
686 @@ -1015,25 +1054,27 @@ static void ioc3_init(struct net_device *dev)
687
688 ioc3_init_rings(dev);
689
690 - ip->emcr |= ((RX_OFFSET / 2) << EMCR_RXOFF_SHIFT) | EMCR_TXDMAEN |
691 - EMCR_TXEN | EMCR_RXDMAEN | EMCR_RXEN | EMCR_PADEN;
692 + ip->emcr |= (((RX_OFFSET / 2) << EMCR_RXOFF_SHIFT) | EMCR_TXDMAEN |
693 + EMCR_TXEN | EMCR_RXDMAEN | EMCR_RXEN | EMCR_PADEN);
694 ioc3_w_emcr(ip->emcr);
695 ioc3_w_eier(EISR_RXTIMERINT | EISR_RXOFLO | EISR_RXBUFOFLO |
696 - EISR_RXMEMERR | EISR_RXPARERR | EISR_TXBUFUFLO |
697 - EISR_TXEXPLICIT | EISR_TXMEMERR);
698 + EISR_RXMEMERR | EISR_RXPARERR | EISR_TXBUFUFLO |
699 + EISR_TXEXPLICIT | EISR_TXMEMERR);
700 (void) ioc3_r_eier();
701 }
702
703 -static inline void ioc3_stop(struct ioc3_private *ip)
704 +static inline void
705 +ioc3_stop(struct ioc3_private *ip)
706 {
707 struct ioc3 *ioc3 = ip->regs;
708
709 - ioc3_w_emcr(0); /* Shutup */
710 - ioc3_w_eier(0); /* Disable interrupts */
711 - (void) ioc3_r_eier(); /* Flush */
712 + ioc3_w_emcr(0); /* Shutup */
713 + ioc3_w_eier(0); /* Disable interrupts */
714 + (void)ioc3_r_eier(); /* Flush */
715 }
716
717 -static int ioc3_open(struct net_device *dev)
718 +static int
719 +ioc3_open(struct net_device *dev)
720 {
721 struct ioc3_private *ip = netdev_priv(dev);
722
723 @@ -1052,18 +1093,17 @@ static int ioc3_open(struct net_device *dev)
724 return 0;
725 }
726
727 -static int ioc3_close(struct net_device *dev)
728 +static int
729 +ioc3_close(struct net_device *dev)
730 {
731 struct ioc3_private *ip = netdev_priv(dev);
732
733 del_timer_sync(&ip->ioc3_timer);
734 -
735 netif_stop_queue(dev);
736 -
737 ioc3_stop(ip);
738 free_irq(dev->irq, dev);
739 -
740 ioc3_free_rings(ip);
741 +
742 return 0;
743 }
744
745 @@ -1077,15 +1117,15 @@ static int ioc3_close(struct net_device *dev)
746 * MiniDINs; all other subdevices are left swinging in the wind, leave
747 * them disabled.
748 */
749 -
750 -static int ioc3_adjacent_is_ioc3(struct pci_dev *pdev, int slot)
751 +static int
752 +ioc3_adjacent_is_ioc3(struct pci_dev *pdev, int slot)
753 {
754 struct pci_dev *dev = pci_get_slot(pdev->bus, PCI_DEVFN(slot, 0));
755 int ret = 0;
756
757 if (dev) {
758 - if (dev->vendor == PCI_VENDOR_ID_SGI &&
759 - dev->device == PCI_DEVICE_ID_SGI_IOC3)
760 + if ((dev->vendor == PCI_VENDOR_ID_SGI) &&
761 + (dev->device == PCI_DEVICE_ID_SGI_IOC3))
762 ret = 1;
763 pci_dev_put(dev);
764 }
765 @@ -1093,7 +1133,8 @@ static int ioc3_adjacent_is_ioc3(struct pci_dev *pdev, int slot)
766 return ret;
767 }
768
769 -static int ioc3_is_menet(struct pci_dev *pdev)
770 +static int
771 +ioc3_is_menet(struct pci_dev *pdev)
772 {
773 return pdev->bus->parent == NULL &&
774 ioc3_adjacent_is_ioc3(pdev, 0) &&
775 @@ -1135,23 +1176,23 @@ static int ioc3_is_menet(struct pci_dev *pdev)
776 * Can't use UPF_IOREMAP as the whole of IOC3 resources have already been
777 * registered.
778 */
779 -static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
780 +static void
781 +ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
782 {
783 #define COSMISC_CONSTANT 6
784
785 struct uart_8250_port port = {
786 - .port = {
787 + .port = {
788 .irq = 0,
789 .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
790 .iotype = UPIO_MEM,
791 .regshift = 0,
792 .uartclk = (22000000 << 1) / COSMISC_CONSTANT,
793 -
794 - .membase = (unsigned char __iomem *) uart,
795 - .mapbase = (unsigned long) uart,
796 - }
797 + .membase = (u8 __iomem *)uart,
798 + .mapbase = (unsigned long)uart,
799 + }
800 };
801 - unsigned char lcr;
802 + u8 lcr;
803
804 lcr = uart->iu_lcr;
805 uart->iu_lcr = lcr | UART_LCR_DLAB;
806 @@ -1161,10 +1202,10 @@ static void ioc3_8250_register(struct ioc3_uartregs __iomem *uart)
807 serial8250_register_8250_port(&port);
808 }
809
810 -static void ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
811 +static void
812 +ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
813 {
814 - /*
815 - * We need to recognice and treat the fourth MENET serial as it
816 + /* We need to recognice and treat the fourth MENET serial as it
817 * does not have an SuperIO chip attached to it, therefore attempting
818 * to access it will result in bus errors. We call something an
819 * MENET if PCI slot 0, 1, 2 and 3 of a master PCI bus all have an IOC3
820 @@ -1175,8 +1216,7 @@ static void ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
821 if (ioc3_is_menet(pdev) && PCI_SLOT(pdev->devfn) == 3)
822 return;
823
824 - /*
825 - * Switch IOC3 to PIO mode. It probably already was but let's be
826 + /* Switch IOC3 to PIO mode. It probably already was but let's be
827 * paranoid
828 */
829 ioc3->gpcr_s = GPCR_UARTA_MODESEL | GPCR_UARTB_MODESEL;
830 @@ -1208,7 +1248,8 @@ static void ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
831 }
832 #endif
833
834 -static const struct net_device_ops ioc3_netdev_ops = {
835 +static const struct net_device_ops
836 +ioc3_netdev_ops = {
837 .ndo_open = ioc3_open,
838 .ndo_stop = ioc3_close,
839 .ndo_start_xmit = ioc3_start_xmit,
840 @@ -1220,9 +1261,10 @@ static const struct net_device_ops ioc3_netdev_ops = {
841 .ndo_set_mac_address = ioc3_set_mac_address,
842 };
843
844 -static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
845 +static int
846 +ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
847 {
848 - unsigned int sw_physid1, sw_physid2;
849 + u32 sw_physid1, sw_physid2;
850 struct net_device *dev = NULL;
851 struct ioc3_private *ip;
852 struct ioc3 *ioc3;
853 @@ -1359,7 +1401,8 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
854 return err;
855 }
856
857 -static void ioc3_remove_one(struct pci_dev *pdev)
858 +static void
859 +ioc3_remove_one(struct pci_dev *pdev)
860 {
861 struct net_device *dev = pci_get_drvdata(pdev);
862 struct ioc3_private *ip = netdev_priv(dev);
863 @@ -1377,27 +1420,29 @@ static void ioc3_remove_one(struct pci_dev *pdev)
864 */
865 }
866
867 -static const struct pci_device_id ioc3_pci_tbl[] = {
868 +static const struct pci_device_id
869 +ioc3_pci_tbl[] = {
870 { PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID },
871 { 0 }
872 };
873 MODULE_DEVICE_TABLE(pci, ioc3_pci_tbl);
874
875 -static struct pci_driver ioc3_driver = {
876 +static struct pci_driver
877 +ioc3_driver = {
878 .name = "ioc3-eth",
879 .id_table = ioc3_pci_tbl,
880 .probe = ioc3_probe,
881 .remove = ioc3_remove_one,
882 };
883
884 -static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
885 +static int
886 +ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
887 {
888 - unsigned long data;
889 struct ioc3_private *ip = netdev_priv(dev);
890 struct ioc3 *ioc3 = ip->regs;
891 - unsigned int len;
892 struct ioc3_etxd *desc;
893 - uint32_t w0 = 0;
894 + unsigned long data;
895 + u32 len, w0 = 0;
896 int produce;
897
898 /*
899 @@ -1410,25 +1455,26 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
900 */
901 if (skb->ip_summed == CHECKSUM_PARTIAL) {
902 const struct iphdr *ih = ip_hdr(skb);
903 - const int proto = ntohs(ih->protocol);
904 - unsigned int csoff;
905 - uint32_t csum, ehsum;
906 - uint16_t *eh;
907 + const u32 proto = ntohs(ih->protocol);
908 + u32 csoff, csum, ehsum;
909 + u16 *eh;
910
911 - /* The MAC header. skb->mac seem the logic approach
912 - to find the MAC header - except it's a NULL pointer ... */
913 - eh = (uint16_t *) skb->data;
914 + /* The MAC header. skb->mac seems the logical approach
915 + * to find the MAC header. Except if it's a NULL pointer...
916 + */
917 + eh = (u16 *)skb->data;
918
919 /* Sum up dest addr, src addr and protocol */
920 ehsum = eh[0] + eh[1] + eh[2] + eh[3] + eh[4] + eh[5] + eh[6];
921
922 - /* Skip IP header; it's sum is always zero and was
923 - already filled in by ip_output.c */
924 + /* Skip IP header; it's sum is always zero and was already
925 + * filled in by ip_output.c
926 + */
927 csum = csum_tcpudp_nofold(ih->saddr, ih->daddr,
928 - ih->tot_len - (ih->ihl << 2),
929 - proto, csum_fold(ehsum));
930 + ih->tot_len - (ih->ihl << 2),
931 + proto, csum_fold(ehsum));
932
933 - csum = (csum & 0xffff) + (csum >> 16); /* Fold again */
934 + csum = (csum & 0xffff) + (csum >> 16); /* Fold again */
935 csum = (csum & 0xffff) + (csum >> 16);
936
937 csoff = ETH_HLEN + (ih->ihl << 2);
938 @@ -1468,9 +1514,9 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
939 unsigned long s2 = data + len - b2;
940
941 desc->cmd = cpu_to_be32(len | ETXD_INTWHENDONE |
942 - ETXD_B1V | ETXD_B2V | w0);
943 + ETXD_B1V | ETXD_B2V | w0);
944 desc->bufcnt = cpu_to_be32((s1 << ETXD_B1CNT_SHIFT) |
945 - (s2 << ETXD_B2CNT_SHIFT));
946 + (s2 << ETXD_B2CNT_SHIFT));
947 desc->p1 = cpu_to_be64(ioc3_map(skb->data, 1));
948 desc->p2 = cpu_to_be64(ioc3_map((void *) b2, 1));
949 } else {
950 @@ -1482,10 +1528,10 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
951
952 BARRIER();
953
954 - ip->tx_skbs[produce] = skb; /* Remember skb */
955 - produce = (produce + 1) & 127;
956 + ip->tx_skbs[produce] = skb; /* Remember skb */
957 + produce = (produce + 1) & 0x7f;
958 ip->tx_pi = produce;
959 - ioc3_w_etpir(produce << 7); /* Fire ... */
960 + ioc3_w_etpir(produce << 7); /* Fire! */
961
962 ip->txqlen++;
963
964 @@ -1497,7 +1543,8 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
965 return NETDEV_TX_OK;
966 }
967
968 -static void ioc3_timeout(struct net_device *dev)
969 +static void
970 +ioc3_timeout(struct net_device *dev)
971 {
972 struct ioc3_private *ip = netdev_priv(dev);
973
974 @@ -1520,15 +1567,16 @@ static void ioc3_timeout(struct net_device *dev)
975 * address's bit index in the logical address filter mask
976 */
977
978 -static inline unsigned int ioc3_hash(const unsigned char *addr)
979 +static inline u32
980 +ioc3_hash(const u8 *addr)
981 {
982 - unsigned int temp = 0;
983 + u32 temp = 0;
984 u32 crc;
985 int bits;
986
987 crc = ether_crc_le(ETH_ALEN, addr);
988
989 - crc &= 0x3f; /* bit reverse lowest 6 bits for hash index */
990 + crc &= 0x3f; /* bit reverse lowest 6 bits for hash index */
991 for (bits = 6; --bits >= 0; ) {
992 temp <<= 1;
993 temp |= (crc & 0x1);
994 @@ -1538,8 +1586,8 @@ static inline unsigned int ioc3_hash(const unsigned char *addr)
995 return temp;
996 }
997
998 -static void ioc3_get_drvinfo (struct net_device *dev,
999 - struct ethtool_drvinfo *info)
1000 +static void
1001 +ioc3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1002 {
1003 struct ioc3_private *ip = netdev_priv(dev);
1004
1005 @@ -1548,8 +1596,9 @@ static void ioc3_get_drvinfo (struct net_device *dev,
1006 strlcpy(info->bus_info, pci_name(ip->pdev), sizeof(info->bus_info));
1007 }
1008
1009 -static int ioc3_get_link_ksettings(struct net_device *dev,
1010 - struct ethtool_link_ksettings *cmd)
1011 +static int
1012 +ioc3_get_link_ksettings(struct net_device *dev,
1013 + struct ethtool_link_ksettings *cmd)
1014 {
1015 struct ioc3_private *ip = netdev_priv(dev);
1016
1017 @@ -1560,8 +1609,9 @@ static int ioc3_get_link_ksettings(struct net_device *dev,
1018 return 0;
1019 }
1020
1021 -static int ioc3_set_link_ksettings(struct net_device *dev,
1022 - const struct ethtool_link_ksettings *cmd)
1023 +static int
1024 +ioc3_set_link_ksettings(struct net_device *dev,
1025 + const struct ethtool_link_ksettings *cmd)
1026 {
1027 struct ioc3_private *ip = netdev_priv(dev);
1028 int rc;
1029 @@ -1573,7 +1623,8 @@ static int ioc3_set_link_ksettings(struct net_device *dev,
1030 return rc;
1031 }
1032
1033 -static int ioc3_nway_reset(struct net_device *dev)
1034 +static int
1035 +ioc3_nway_reset(struct net_device *dev)
1036 {
1037 struct ioc3_private *ip = netdev_priv(dev);
1038 int rc;
1039 @@ -1585,7 +1636,8 @@ static int ioc3_nway_reset(struct net_device *dev)
1040 return rc;
1041 }
1042
1043 -static u32 ioc3_get_link(struct net_device *dev)
1044 +static u32
1045 +ioc3_get_link(struct net_device *dev)
1046 {
1047 struct ioc3_private *ip = netdev_priv(dev);
1048 int rc;
1049 @@ -1597,7 +1649,8 @@ static u32 ioc3_get_link(struct net_device *dev)
1050 return rc;
1051 }
1052
1053 -static const struct ethtool_ops ioc3_ethtool_ops = {
1054 +static const struct ethtool_ops
1055 +ioc3_ethtool_ops = {
1056 .get_drvinfo = ioc3_get_drvinfo,
1057 .nway_reset = ioc3_nway_reset,
1058 .get_link = ioc3_get_link,
1059 @@ -1605,7 +1658,8 @@ static const struct ethtool_ops ioc3_ethtool_ops = {
1060 .set_link_ksettings = ioc3_set_link_ksettings,
1061 };
1062
1063 -static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1064 +static int
1065 +ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1066 {
1067 struct ioc3_private *ip = netdev_priv(dev);
1068 int rc;
1069 @@ -1617,29 +1671,31 @@ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1070 return rc;
1071 }
1072
1073 -static void ioc3_set_multicast_list(struct net_device *dev)
1074 +static void
1075 +ioc3_set_multicast_list(struct net_device *dev)
1076 {
1077 struct netdev_hw_addr *ha;
1078 struct ioc3_private *ip = netdev_priv(dev);
1079 struct ioc3 *ioc3 = ip->regs;
1080 u64 ehar = 0;
1081
1082 - netif_stop_queue(dev); /* Lock out others. */
1083 + netif_stop_queue(dev); /* Lock out others. */
1084
1085 - if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1086 + if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1087 ip->emcr |= EMCR_PROMISC;
1088 ioc3_w_emcr(ip->emcr);
1089 (void) ioc3_r_emcr();
1090 } else {
1091 ip->emcr &= ~EMCR_PROMISC;
1092 - ioc3_w_emcr(ip->emcr); /* Clear promiscuous. */
1093 + ioc3_w_emcr(ip->emcr); /* Clear promiscuous. */
1094 (void) ioc3_r_emcr();
1095
1096 if ((dev->flags & IFF_ALLMULTI) ||
1097 (netdev_mc_count(dev) > 64)) {
1098 /* Too many for hashing to make sense or we want all
1099 - multicast packets anyway, so skip computing all the
1100 - hashes and just accept all packets. */
1101 + * multicast packets anyway, so skip computing all
1102 + * the hashes and just accept all packets.
1103 + */
1104 ip->ehar_h = 0xffffffff;
1105 ip->ehar_l = 0xffffffff;
1106 } else {
1107 @@ -1653,7 +1709,7 @@ static void ioc3_set_multicast_list(struct net_device *dev)
1108 ioc3_w_ehar_l(ip->ehar_l);
1109 }
1110
1111 - netif_wake_queue(dev); /* Let us get going again. */
1112 + netif_wake_queue(dev); /* Let us get going again. */
1113 }
1114
1115 module_pci_driver(ioc3_driver);
t2sde