diff options
Diffstat (limited to 'drivers/net/3c507.c')
-rw-r--r-- | drivers/net/3c507.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index 6039049259ed..8205a535c5b7 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -294,14 +294,14 @@ static void el16_tx_timeout (struct net_device *dev); | |||
294 | 294 | ||
295 | static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad); | 295 | static void hardware_send_packet(struct net_device *dev, void *buf, short length, short pad); |
296 | static void init_82586_mem(struct net_device *dev); | 296 | static void init_82586_mem(struct net_device *dev); |
297 | static struct ethtool_ops netdev_ethtool_ops; | 297 | static const struct ethtool_ops netdev_ethtool_ops; |
298 | static void init_rx_bufs(struct net_device *); | 298 | static void init_rx_bufs(struct net_device *); |
299 | 299 | ||
300 | static int io = 0x300; | 300 | static int io = 0x300; |
301 | static int irq; | 301 | static int irq; |
302 | static int mem_start; | 302 | static int mem_start; |
303 | 303 | ||
304 | 304 | ||
305 | /* Check for a network adaptor of this type, and return '0' iff one exists. | 305 | /* Check for a network adaptor of this type, and return '0' iff one exists. |
306 | If dev->base_addr == 0, probe all likely locations. | 306 | If dev->base_addr == 0, probe all likely locations. |
307 | If dev->base_addr == 1, always return failure. | 307 | If dev->base_addr == 1, always return failure. |
@@ -379,7 +379,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr) | |||
379 | if (!request_region(ioaddr, EL16_IO_EXTENT, DRV_NAME)) | 379 | if (!request_region(ioaddr, EL16_IO_EXTENT, DRV_NAME)) |
380 | return -ENODEV; | 380 | return -ENODEV; |
381 | 381 | ||
382 | if ((inb(ioaddr) != '*') || (inb(ioaddr + 1) != '3') || | 382 | if ((inb(ioaddr) != '*') || (inb(ioaddr + 1) != '3') || |
383 | (inb(ioaddr + 2) != 'C') || (inb(ioaddr + 3) != 'O')) { | 383 | (inb(ioaddr + 2) != 'C') || (inb(ioaddr + 3) != 'O')) { |
384 | retval = -ENODEV; | 384 | retval = -ENODEV; |
385 | goto out; | 385 | goto out; |
@@ -575,7 +575,7 @@ static irqreturn_t el16_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
575 | while (lp->tx_pkts_in_ring) { | 575 | while (lp->tx_pkts_in_ring) { |
576 | unsigned short tx_status = readw(shmem+lp->tx_reap); | 576 | unsigned short tx_status = readw(shmem+lp->tx_reap); |
577 | if (!(tx_status & 0x8000)) { | 577 | if (!(tx_status & 0x8000)) { |
578 | if (net_debug > 5) | 578 | if (net_debug > 5) |
579 | printk("Tx command incomplete (%#x).\n", lp->tx_reap); | 579 | printk("Tx command incomplete (%#x).\n", lp->tx_reap); |
580 | break; | 580 | break; |
581 | } | 581 | } |
@@ -825,7 +825,7 @@ static void hardware_send_packet(struct net_device *dev, void *buf, short length | |||
825 | } | 825 | } |
826 | 826 | ||
827 | /* Grimly block further packets if there has been insufficient reaping. */ | 827 | /* Grimly block further packets if there has been insufficient reaping. */ |
828 | if (++lp->tx_pkts_in_ring < NUM_TX_BUFS) | 828 | if (++lp->tx_pkts_in_ring < NUM_TX_BUFS) |
829 | netif_wake_queue(dev); | 829 | netif_wake_queue(dev); |
830 | } | 830 | } |
831 | 831 | ||
@@ -919,7 +919,7 @@ static void netdev_set_msglevel(struct net_device *dev, u32 level) | |||
919 | debug = level; | 919 | debug = level; |
920 | } | 920 | } |
921 | 921 | ||
922 | static struct ethtool_ops netdev_ethtool_ops = { | 922 | static const struct ethtool_ops netdev_ethtool_ops = { |
923 | .get_drvinfo = netdev_get_drvinfo, | 923 | .get_drvinfo = netdev_get_drvinfo, |
924 | .get_msglevel = netdev_get_msglevel, | 924 | .get_msglevel = netdev_get_msglevel, |
925 | .set_msglevel = netdev_set_msglevel, | 925 | .set_msglevel = netdev_set_msglevel, |
@@ -953,7 +953,7 @@ cleanup_module(void) | |||
953 | #endif /* MODULE */ | 953 | #endif /* MODULE */ |
954 | MODULE_LICENSE("GPL"); | 954 | MODULE_LICENSE("GPL"); |
955 | 955 | ||
956 | 956 | ||
957 | /* | 957 | /* |
958 | * Local variables: | 958 | * Local variables: |
959 | * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -I/usr/src/linux/drivers/net -Wall -Wstrict-prototypes -O6 -m486 -c 3c507.c" | 959 | * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -I/usr/src/linux/drivers/net -Wall -Wstrict-prototypes -O6 -m486 -c 3c507.c" |