aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/82596.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/82596.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r--drivers/net/82596.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 257d3bce399..c9e4dca9d41 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -444,7 +444,7 @@ static inline int wait_cmd(struct net_device *dev, struct i596_private *lp, int
444static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int delcnt, char *str) 444static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int delcnt, char *str)
445{ 445{
446 volatile struct i596_cmd *c = cmd; 446 volatile struct i596_cmd *c = cmd;
447 447
448 while (--delcnt && c->command) 448 while (--delcnt && c->command)
449 udelay(10); 449 udelay(10);
450 if (!delcnt) { 450 if (!delcnt) {
@@ -455,7 +455,7 @@ static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int del
455 return 0; 455 return 0;
456} 456}
457 457
458 458
459static void i596_display_data(struct net_device *dev) 459static void i596_display_data(struct net_device *dev)
460{ 460{
461 struct i596_private *lp = dev->priv; 461 struct i596_private *lp = dev->priv;
@@ -787,7 +787,7 @@ static inline int i596_rx(struct net_device *dev)
787 } 787 }
788 DEB(DEB_RXFRAME, printk(KERN_DEBUG " rfd %p, rfd.rbd %p, rfd.stat %04x\n", 788 DEB(DEB_RXFRAME, printk(KERN_DEBUG " rfd %p, rfd.rbd %p, rfd.stat %04x\n",
789 rfd, rfd->rbd, rfd->stat)); 789 rfd, rfd->rbd, rfd->stat));
790 790
791 if (rbd != I596_NULL && ((rfd->stat) & STAT_OK)) { 791 if (rbd != I596_NULL && ((rfd->stat) & STAT_OK)) {
792 /* a good frame */ 792 /* a good frame */
793 int pkt_len = rbd->count & 0x3fff; 793 int pkt_len = rbd->count & 0x3fff;
@@ -1208,7 +1208,7 @@ struct net_device * __init i82596_probe(int unit)
1208 Some other boards trip the checksum.. but then appear as 1208 Some other boards trip the checksum.. but then appear as
1209 ether address 0. Trap these - AC */ 1209 ether address 0. Trap these - AC */
1210 1210
1211 if ((checksum % 0x100) || 1211 if ((checksum % 0x100) ||
1212 (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)) { 1212 (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)) {
1213 err = -ENODEV; 1213 err = -ENODEV;
1214 goto out1; 1214 goto out1;
@@ -1545,7 +1545,7 @@ static void set_multicast_list(struct net_device *dev)
1545 printk(KERN_ERR "%s: Only %d multicast addresses supported", 1545 printk(KERN_ERR "%s: Only %d multicast addresses supported",
1546 dev->name, cnt); 1546 dev->name, cnt);
1547 } 1547 }
1548 1548
1549 if (dev->mc_count > 0) { 1549 if (dev->mc_count > 0) {
1550 struct dev_mc_list *dmi; 1550 struct dev_mc_list *dmi;
1551 unsigned char *cp; 1551 unsigned char *cp;
@@ -1609,7 +1609,7 @@ void __exit cleanup_module(void)
1609} 1609}
1610 1610
1611#endif /* MODULE */ 1611#endif /* MODULE */
1612 1612
1613/* 1613/*
1614 * Local variables: 1614 * Local variables:
1615 * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c 82596.c" 1615 * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c 82596.c"