diff options
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 0418045166c3..0afa72095810 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -321,7 +321,6 @@ static int axnet_config(struct pcmcia_device *link) | |||
321 | struct net_device *dev = link->priv; | 321 | struct net_device *dev = link->priv; |
322 | axnet_dev_t *info = PRIV(dev); | 322 | axnet_dev_t *info = PRIV(dev); |
323 | int i, j, last_ret, last_fn; | 323 | int i, j, last_ret, last_fn; |
324 | DECLARE_MAC_BUF(mac); | ||
325 | 324 | ||
326 | DEBUG(0, "axnet_config(0x%p)\n", link); | 325 | DEBUG(0, "axnet_config(0x%p)\n", link); |
327 | 326 | ||
@@ -397,10 +396,10 @@ static int axnet_config(struct pcmcia_device *link) | |||
397 | strcpy(info->node.dev_name, dev->name); | 396 | strcpy(info->node.dev_name, dev->name); |
398 | 397 | ||
399 | printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, " | 398 | printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, " |
400 | "hw_addr %s\n", | 399 | "hw_addr %pM\n", |
401 | dev->name, ((info->flags & IS_AX88790) ? 7 : 1), | 400 | dev->name, ((info->flags & IS_AX88790) ? 7 : 1), |
402 | dev->base_addr, dev->irq, | 401 | dev->base_addr, dev->irq, |
403 | print_mac(mac, dev->dev_addr)); | 402 | dev->dev_addr); |
404 | if (info->phy_id != -1) { | 403 | if (info->phy_id != -1) { |
405 | DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j); | 404 | DEBUG(0, " MII transceiver at index %d, status %x.\n", info->phy_id, j); |
406 | } else { | 405 | } else { |
@@ -906,7 +905,7 @@ int ei_debug = 1; | |||
906 | /* Index to functions. */ | 905 | /* Index to functions. */ |
907 | static void ei_tx_intr(struct net_device *dev); | 906 | static void ei_tx_intr(struct net_device *dev); |
908 | static void ei_tx_err(struct net_device *dev); | 907 | static void ei_tx_err(struct net_device *dev); |
909 | static void ei_tx_timeout(struct net_device *dev); | 908 | static void axnet_tx_timeout(struct net_device *dev); |
910 | static void ei_receive(struct net_device *dev); | 909 | static void ei_receive(struct net_device *dev); |
911 | static void ei_rx_overrun(struct net_device *dev); | 910 | static void ei_rx_overrun(struct net_device *dev); |
912 | 911 | ||
@@ -957,9 +956,9 @@ static int ax_open(struct net_device *dev) | |||
957 | 956 | ||
958 | #ifdef HAVE_TX_TIMEOUT | 957 | #ifdef HAVE_TX_TIMEOUT |
959 | /* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout | 958 | /* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout |
960 | wrapper that does e.g. media check & then calls ei_tx_timeout. */ | 959 | wrapper that does e.g. media check & then calls axnet_tx_timeout. */ |
961 | if (dev->tx_timeout == NULL) | 960 | if (dev->tx_timeout == NULL) |
962 | dev->tx_timeout = ei_tx_timeout; | 961 | dev->tx_timeout = axnet_tx_timeout; |
963 | if (dev->watchdog_timeo <= 0) | 962 | if (dev->watchdog_timeo <= 0) |
964 | dev->watchdog_timeo = TX_TIMEOUT; | 963 | dev->watchdog_timeo = TX_TIMEOUT; |
965 | #endif | 964 | #endif |
@@ -1003,14 +1002,14 @@ static int ax_close(struct net_device *dev) | |||
1003 | } | 1002 | } |
1004 | 1003 | ||
1005 | /** | 1004 | /** |
1006 | * ei_tx_timeout - handle transmit time out condition | 1005 | * axnet_tx_timeout - handle transmit time out condition |
1007 | * @dev: network device which has apparently fallen asleep | 1006 | * @dev: network device which has apparently fallen asleep |
1008 | * | 1007 | * |
1009 | * Called by kernel when device never acknowledges a transmit has | 1008 | * Called by kernel when device never acknowledges a transmit has |
1010 | * completed (or failed) - i.e. never posted a Tx related interrupt. | 1009 | * completed (or failed) - i.e. never posted a Tx related interrupt. |
1011 | */ | 1010 | */ |
1012 | 1011 | ||
1013 | static void ei_tx_timeout(struct net_device *dev) | 1012 | static void axnet_tx_timeout(struct net_device *dev) |
1014 | { | 1013 | { |
1015 | long e8390_base = dev->base_addr; | 1014 | long e8390_base = dev->base_addr; |
1016 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1015 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); |
@@ -1047,14 +1046,14 @@ static void ei_tx_timeout(struct net_device *dev) | |||
1047 | } | 1046 | } |
1048 | 1047 | ||
1049 | /** | 1048 | /** |
1050 | * ei_start_xmit - begin packet transmission | 1049 | * axnet_start_xmit - begin packet transmission |
1051 | * @skb: packet to be sent | 1050 | * @skb: packet to be sent |
1052 | * @dev: network device to which packet is sent | 1051 | * @dev: network device to which packet is sent |
1053 | * | 1052 | * |
1054 | * Sends a packet to an 8390 network device. | 1053 | * Sends a packet to an 8390 network device. |
1055 | */ | 1054 | */ |
1056 | 1055 | ||
1057 | static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1056 | static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev) |
1058 | { | 1057 | { |
1059 | long e8390_base = dev->base_addr; | 1058 | long e8390_base = dev->base_addr; |
1060 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 1059 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); |
@@ -1493,7 +1492,6 @@ static void ei_receive(struct net_device *dev) | |||
1493 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); | 1492 | ei_block_input(dev, pkt_len, skb, current_offset + sizeof(rx_frame)); |
1494 | skb->protocol=eth_type_trans(skb,dev); | 1493 | skb->protocol=eth_type_trans(skb,dev); |
1495 | netif_rx(skb); | 1494 | netif_rx(skb); |
1496 | dev->last_rx = jiffies; | ||
1497 | dev->stats.rx_packets++; | 1495 | dev->stats.rx_packets++; |
1498 | dev->stats.rx_bytes += pkt_len; | 1496 | dev->stats.rx_bytes += pkt_len; |
1499 | if (pkt_stat & ENRSR_PHY) | 1497 | if (pkt_stat & ENRSR_PHY) |
@@ -1720,7 +1718,7 @@ static void axdev_setup(struct net_device *dev) | |||
1720 | ei_local = (struct ei_device *)netdev_priv(dev); | 1718 | ei_local = (struct ei_device *)netdev_priv(dev); |
1721 | spin_lock_init(&ei_local->page_lock); | 1719 | spin_lock_init(&ei_local->page_lock); |
1722 | 1720 | ||
1723 | dev->hard_start_xmit = &ei_start_xmit; | 1721 | dev->hard_start_xmit = &axnet_start_xmit; |
1724 | dev->get_stats = get_stats; | 1722 | dev->get_stats = get_stats; |
1725 | dev->set_multicast_list = &set_multicast_list; | 1723 | dev->set_multicast_list = &set_multicast_list; |
1726 | 1724 | ||