diff options
Diffstat (limited to 'drivers/staging/et131x/et131x_netdev.c')
-rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 327 |
1 files changed, 98 insertions, 229 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 59e99cc7786b..8c7612f63f91 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c @@ -2,7 +2,7 @@ * Agere Systems Inc. * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs * - * Copyright © 2005 Agere Systems Inc. + * Copyright © 2005 Agere Systems Inc. * All rights reserved. * http://www.agere.com * @@ -19,7 +19,7 @@ * software indicates your acceptance of these terms and conditions. If you do * not agree with these terms and conditions, do not use the software. * - * Copyright © 2005 Agere Systems Inc. + * Copyright © 2005 Agere Systems Inc. * All rights reserved. * * Redistribution and use in source or binary forms, with or without @@ -40,7 +40,7 @@ * * Disclaimer * - * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN @@ -56,7 +56,6 @@ */ #include "et131x_version.h" -#include "et131x_debug.h" #include "et131x_defs.h" #include <linux/init.h> @@ -73,9 +72,10 @@ #include <linux/interrupt.h> #include <linux/in.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> +#include <linux/bitops.h> +#include <linux/pci.h> #include <asm/system.h> -#include <asm/bitops.h> #include <linux/mii.h> #include <linux/netdevice.h> @@ -94,11 +94,6 @@ #include "et131x_isr.h" #include "et131x_initpci.h" -/* Data for debugging facilities */ -#ifdef CONFIG_ET131X_DEBUG -extern dbg_info_t *et131x_dbginfo; -#endif /* CONFIG_ET131X_DEBUG */ - struct net_device_stats *et131x_stats(struct net_device *netdev); int et131x_open(struct net_device *netdev); int et131x_close(struct net_device *netdev); @@ -138,33 +133,27 @@ struct net_device *et131x_device_alloc(void) { struct net_device *netdev; - DBG_ENTER(et131x_dbginfo); - /* Alloc net_device and adapter structs */ netdev = alloc_etherdev(sizeof(struct et131x_adapter)); if (netdev == NULL) { - DBG_ERROR(et131x_dbginfo, - "Alloc of net_device struct failed\n"); - DBG_LEAVE(et131x_dbginfo); + printk(KERN_ERR "et131x: Alloc of net_device struct failed\n"); return NULL; } /* Setup the function registration table (and other data) for a * net_device */ - //netdev->init = &et131x_init; - //netdev->set_config = &et131x_config; + /* netdev->init = &et131x_init; */ + /* netdev->set_config = &et131x_config; */ netdev->watchdog_timeo = ET131X_TX_TIMEOUT; netdev->netdev_ops = &et131x_netdev_ops; - //netdev->ethtool_ops = &et131x_ethtool_ops; - - // Poll? - //netdev->poll = &et131x_poll; - //netdev->poll_controller = &et131x_poll_controller; + /* netdev->ethtool_ops = &et131x_ethtool_ops; */ - DBG_LEAVE(et131x_dbginfo); + /* Poll? */ + /* netdev->poll = &et131x_poll; */ + /* netdev->poll_controller = &et131x_poll_controller; */ return netdev; } @@ -180,8 +169,6 @@ struct net_device_stats *et131x_stats(struct net_device *netdev) struct net_device_stats *stats = &adapter->net_stats; CE_STATS_t *devstat = &adapter->Stats; - DBG_ENTER(et131x_dbginfo); - stats->rx_packets = devstat->ipackets; stats->tx_packets = devstat->opackets; stats->rx_errors = devstat->length_err + devstat->alignment_err + @@ -194,25 +181,25 @@ struct net_device_stats *et131x_stats(struct net_device *netdev) stats->rx_over_errors = devstat->rx_ov_flow; stats->rx_crc_errors = devstat->crc_err; - // NOTE: These stats don't have corresponding values in CE_STATS, so we're - // going to have to update these directly from within the TX/RX code - //stats->rx_bytes = 20; //devstat->; - //stats->tx_bytes = 20; //devstat->; - //stats->rx_dropped = devstat->; - //stats->tx_dropped = devstat->; - - // NOTE: Not used, can't find analogous statistics - //stats->rx_frame_errors = devstat->; - //stats->rx_fifo_errors = devstat->; - //stats->rx_missed_errors = devstat->; - - //stats->tx_aborted_errors = devstat->; - //stats->tx_carrier_errors = devstat->; - //stats->tx_fifo_errors = devstat->; - //stats->tx_heartbeat_errors = devstat->; - //stats->tx_window_errors = devstat->; - - DBG_LEAVE(et131x_dbginfo); + /* NOTE: These stats don't have corresponding values in CE_STATS, + * so we're going to have to update these directly from within the + * TX/RX code + */ + /* stats->rx_bytes = 20; devstat->; */ + /* stats->tx_bytes = 20; devstat->; */ + /* stats->rx_dropped = devstat->; */ + /* stats->tx_dropped = devstat->; */ + + /* NOTE: Not used, can't find analogous statistics */ + /* stats->rx_frame_errors = devstat->; */ + /* stats->rx_fifo_errors = devstat->; */ + /* stats->rx_missed_errors = devstat->; */ + + /* stats->tx_aborted_errors = devstat->; */ + /* stats->tx_carrier_errors = devstat->; */ + /* stats->tx_fifo_errors = devstat->; */ + /* stats->tx_heartbeat_errors = devstat->; */ + /* stats->tx_window_errors = devstat->; */ return stats; } @@ -227,20 +214,15 @@ int et131x_open(struct net_device *netdev) int result = 0; struct et131x_adapter *adapter = netdev_priv(netdev); - DBG_ENTER(et131x_dbginfo); - /* Start the timer to track NIC errors */ add_timer(&adapter->ErrorTimer); - /* Register our ISR */ - DBG_TRACE(et131x_dbginfo, "Registering ISR...\n"); - - result = - request_irq(netdev->irq, et131x_isr, IRQF_SHARED, netdev->name, - netdev); + /* Register our IRQ */ + result = request_irq(netdev->irq, et131x_isr, IRQF_SHARED, + netdev->name, netdev); if (result) { - DBG_ERROR(et131x_dbginfo, "Could not register ISR\n"); - DBG_LEAVE(et131x_dbginfo); + dev_err(&adapter->pdev->dev, "c ould not register IRQ %d\n", + netdev->irq); return result; } @@ -251,12 +233,10 @@ int et131x_open(struct net_device *netdev) /* Enable device interrupts */ et131x_enable_interrupts(adapter); - MP_SET_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE); + adapter->Flags |= fMP_ADAPTER_INTERRUPT_IN_USE; /* We're ready to move some data, so start the queue */ netif_start_queue(netdev); - - DBG_LEAVE(et131x_dbginfo); return result; } @@ -270,8 +250,6 @@ int et131x_close(struct net_device *netdev) { struct et131x_adapter *adapter = netdev_priv(netdev); - DBG_ENTER(et131x_dbginfo); - /* First thing is to stop the queue */ netif_stop_queue(netdev); @@ -283,15 +261,11 @@ int et131x_close(struct net_device *netdev) et131x_disable_interrupts(adapter); /* Deregistering ISR */ - MP_CLEAR_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE); - - DBG_TRACE(et131x_dbginfo, "Deregistering ISR...\n"); + adapter->Flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE; free_irq(netdev->irq, netdev); /* Stop the error timer */ del_timer_sync(&adapter->ErrorTimer); - - DBG_LEAVE(et131x_dbginfo); return 0; } @@ -306,42 +280,33 @@ int et131x_close(struct net_device *netdev) int et131x_ioctl_mii(struct net_device *netdev, struct ifreq *reqbuf, int cmd) { int status = 0; - struct et131x_adapter *pAdapter = netdev_priv(netdev); + struct et131x_adapter *etdev = netdev_priv(netdev); struct mii_ioctl_data *data = if_mii(reqbuf); - DBG_ENTER(et131x_dbginfo); - switch (cmd) { case SIOCGMIIPHY: - DBG_VERBOSE(et131x_dbginfo, "SIOCGMIIPHY\n"); - data->phy_id = pAdapter->Stats.xcvr_addr; + data->phy_id = etdev->Stats.xcvr_addr; break; case SIOCGMIIREG: - DBG_VERBOSE(et131x_dbginfo, "SIOCGMIIREG\n"); - if (!capable(CAP_NET_ADMIN)) { + if (!capable(CAP_NET_ADMIN)) status = -EPERM; - } else { - status = MiRead(pAdapter, + else + status = MiRead(etdev, data->reg_num, &data->val_out); - } break; case SIOCSMIIREG: - DBG_VERBOSE(et131x_dbginfo, "SIOCSMIIREG\n"); - if (!capable(CAP_NET_ADMIN)) { + if (!capable(CAP_NET_ADMIN)) status = -EPERM; - } else { - status = MiWrite(pAdapter, data->reg_num, + else + status = MiWrite(etdev, data->reg_num, data->val_in); - } break; default: status = -EOPNOTSUPP; } - - DBG_LEAVE(et131x_dbginfo); return status; } @@ -357,8 +322,6 @@ int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd) { int status = 0; - DBG_ENTER(et131x_dbginfo); - switch (cmd) { case SIOCGMIIPHY: case SIOCGMIIREG: @@ -367,12 +330,8 @@ int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf, int cmd) break; default: - DBG_WARNING(et131x_dbginfo, "Unhandled IOCTL Code: 0x%04x\n", - cmd); status = -EOPNOTSUPP; } - - DBG_LEAVE(et131x_dbginfo); return status; } @@ -389,10 +348,8 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) RXMAC_CTRL_t ctrl; RXMAC_PF_CTRL_t pf_ctrl; - DBG_ENTER(et131x_dbginfo); - - ctrl.value = readl(&adapter->CSRAddress->rxmac.ctrl.value); - pf_ctrl.value = readl(&adapter->CSRAddress->rxmac.pf_ctrl.value); + ctrl.value = readl(&adapter->regs->rxmac.ctrl.value); + pf_ctrl.value = readl(&adapter->regs->rxmac.pf_ctrl.value); /* Default to disabled packet filtering. Enable it in the individual * case statements that require the device to filter something @@ -413,11 +370,8 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) * multicast entries or (3) we receive none. */ if (filter & ET131X_PACKET_TYPE_ALL_MULTICAST) { - DBG_VERBOSE(et131x_dbginfo, - "Multicast filtering OFF (Rx ALL MULTICAST)\n"); pf_ctrl.bits.filter_multi_en = 0; } else { - DBG_VERBOSE(et131x_dbginfo, "Multicast filtering ON\n"); SetupDeviceForMulticast(adapter); pf_ctrl.bits.filter_multi_en = 1; ctrl.bits.pkt_filter_disable = 0; @@ -425,7 +379,6 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) /* Set us up with Unicast packet filtering */ if (filter & ET131X_PACKET_TYPE_DIRECTED) { - DBG_VERBOSE(et131x_dbginfo, "Unicast Filtering ON\n"); SetupDeviceForUnicast(adapter); pf_ctrl.bits.filter_uni_en = 1; ctrl.bits.pkt_filter_disable = 0; @@ -433,12 +386,9 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) /* Set us up with Broadcast packet filtering */ if (filter & ET131X_PACKET_TYPE_BROADCAST) { - DBG_VERBOSE(et131x_dbginfo, "Broadcast Filtering ON\n"); pf_ctrl.bits.filter_broad_en = 1; ctrl.bits.pkt_filter_disable = 0; } else { - DBG_VERBOSE(et131x_dbginfo, - "Broadcast Filtering OFF\n"); pf_ctrl.bits.filter_broad_en = 0; } @@ -447,11 +397,9 @@ int et131x_set_packet_filter(struct et131x_adapter *adapter) * in the control reg. */ writel(pf_ctrl.value, - &adapter->CSRAddress->rxmac.pf_ctrl.value); - writel(ctrl.value, &adapter->CSRAddress->rxmac.ctrl.value); + &adapter->regs->rxmac.pf_ctrl.value); + writel(ctrl.value, &adapter->regs->rxmac.ctrl.value); } - - DBG_LEAVE(et131x_dbginfo); return status; } @@ -464,12 +412,10 @@ void et131x_multicast(struct net_device *netdev) struct et131x_adapter *adapter = netdev_priv(netdev); uint32_t PacketFilter = 0; uint32_t count; - unsigned long lockflags; + unsigned long flags; struct dev_mc_list *mclist = netdev->mc_list; - DBG_ENTER(et131x_dbginfo); - - spin_lock_irqsave(&adapter->Lock, lockflags); + spin_lock_irqsave(&adapter->Lock, flags); /* Before we modify the platform-independent filter flags, store them * locally. This allows us to determine if anything's changed and if @@ -487,37 +433,25 @@ void et131x_multicast(struct net_device *netdev) /* Check the net_device flags and set the device independent flags * accordingly */ - DBG_VERBOSE(et131x_dbginfo, - "MULTICAST ADDR COUNT: %d\n", netdev->mc_count); if (netdev->flags & IFF_PROMISC) { - DBG_VERBOSE(et131x_dbginfo, "Request: PROMISCUOUS MODE ON\n"); adapter->PacketFilter |= ET131X_PACKET_TYPE_PROMISCUOUS; } else { - DBG_VERBOSE(et131x_dbginfo, "Request: PROMISCUOUS MODE OFF\n"); adapter->PacketFilter &= ~ET131X_PACKET_TYPE_PROMISCUOUS; } if (netdev->flags & IFF_ALLMULTI) { - DBG_VERBOSE(et131x_dbginfo, "Request: ACCEPT ALL MULTICAST\n"); adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST; } if (netdev->mc_count > NIC_MAX_MCAST_LIST) { - DBG_WARNING(et131x_dbginfo, - "ACCEPT ALL MULTICAST for now, as there's more Multicast " - "addresses than the HW supports\n"); - adapter->PacketFilter |= ET131X_PACKET_TYPE_ALL_MULTICAST; } if (netdev->mc_count < 1) { - DBG_VERBOSE(et131x_dbginfo, "Request: REJECT ALL MULTICAST\n"); adapter->PacketFilter &= ~ET131X_PACKET_TYPE_ALL_MULTICAST; adapter->PacketFilter &= ~ET131X_PACKET_TYPE_MULTICAST; } else { - DBG_VERBOSE(et131x_dbginfo, - "Request: SET MULTICAST FILTER(S)\n"); adapter->PacketFilter |= ET131X_PACKET_TYPE_MULTICAST; } @@ -525,14 +459,8 @@ void et131x_multicast(struct net_device *netdev) adapter->MCAddressCount = netdev->mc_count; if (netdev->mc_count) { - if (mclist->dmi_addrlen != ETH_ALEN) { - DBG_WARNING(et131x_dbginfo, - "Multicast addrs are not ETH_ALEN in size\n"); - } else { - count = netdev->mc_count - 1; - memcpy(adapter->MCList[count], mclist->dmi_addr, - ETH_ALEN); - } + count = netdev->mc_count - 1; + memcpy(adapter->MCList[count], mclist->dmi_addr, ETH_ALEN); } /* Are the new flags different from the previous ones? If not, then no @@ -543,17 +471,9 @@ void et131x_multicast(struct net_device *netdev) */ if (PacketFilter != adapter->PacketFilter) { /* Call the device's filter function */ - DBG_VERBOSE(et131x_dbginfo, "UPDATE REQUIRED, FLAGS changed\n"); - et131x_set_packet_filter(adapter); - } else { - DBG_VERBOSE(et131x_dbginfo, - "NO UPDATE REQUIRED, FLAGS didn't change\n"); } - - spin_unlock_irqrestore(&adapter->Lock, lockflags); - - DBG_LEAVE(et131x_dbginfo); + spin_unlock_irqrestore(&adapter->Lock, flags); } /** @@ -567,8 +487,6 @@ int et131x_tx(struct sk_buff *skb, struct net_device *netdev) { int status = 0; - DBG_TX_ENTER(et131x_dbginfo); - /* Save the timestamp for the TX timeout watchdog */ netdev->trans_start = jiffies; @@ -578,22 +496,15 @@ int et131x_tx(struct sk_buff *skb, struct net_device *netdev) /* Check status and manage the netif queue if necessary */ if (status != 0) { if (status == -ENOMEM) { - DBG_VERBOSE(et131x_dbginfo, - "OUT OF TCBs; STOP NETIF QUEUE\n"); - /* Put the queue to sleep until resources are * available */ netif_stop_queue(netdev); status = NETDEV_TX_BUSY; } else { - DBG_WARNING(et131x_dbginfo, - "Misc error; drop packet\n"); status = NETDEV_TX_OK; } } - - DBG_TX_LEAVE(et131x_dbginfo); return status; } @@ -607,80 +518,52 @@ int et131x_tx(struct sk_buff *skb, struct net_device *netdev) */ void et131x_tx_timeout(struct net_device *netdev) { - struct et131x_adapter *pAdapter = netdev_priv(netdev); + struct et131x_adapter *etdev = netdev_priv(netdev); PMP_TCB pMpTcb; - unsigned long lockflags; - - DBG_WARNING(et131x_dbginfo, "TX TIMEOUT\n"); + unsigned long flags; /* Just skip this part if the adapter is doing link detection */ - if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_LINK_DETECTION)) { - DBG_ERROR(et131x_dbginfo, "Still doing link detection\n"); + if (etdev->Flags & fMP_ADAPTER_LINK_DETECTION) return; - } /* Any nonrecoverable hardware error? * Checks adapter->flags for any failure in phy reading */ - if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_NON_RECOVER_ERROR)) { - DBG_WARNING(et131x_dbginfo, "Non recoverable error - remove\n"); + if (etdev->Flags & fMP_ADAPTER_NON_RECOVER_ERROR) return; - } /* Hardware failure? */ - if (MP_TEST_FLAG(pAdapter, fMP_ADAPTER_HARDWARE_ERROR)) { - DBG_WARNING(et131x_dbginfo, "hardware error - reset\n"); + if (etdev->Flags & fMP_ADAPTER_HARDWARE_ERROR) { + dev_err(&etdev->pdev->dev, "hardware error - reset\n"); return; } /* Is send stuck? */ - spin_lock_irqsave(&pAdapter->TCBSendQLock, lockflags); + spin_lock_irqsave(&etdev->TCBSendQLock, flags); - pMpTcb = pAdapter->TxRing.CurrSendHead; + pMpTcb = etdev->TxRing.CurrSendHead; if (pMpTcb != NULL) { pMpTcb->Count++; if (pMpTcb->Count > NIC_SEND_HANG_THRESHOLD) { -#ifdef CONFIG_ET131X_DEBUG - TX_STATUS_BLOCK_t txDmaComplete = - *(pAdapter->TxRing.pTxStatusVa); - PTX_DESC_ENTRY_t pDesc = - pAdapter->TxRing.pTxDescRingVa + - pMpTcb->WrIndex.bits.val; -#endif TX_DESC_ENTRY_t StuckDescriptors[10]; - if (pMpTcb->WrIndex.bits.val > 7) { + if (INDEX10(pMpTcb->WrIndex) > 7) { memcpy(StuckDescriptors, - pAdapter->TxRing.pTxDescRingVa + - pMpTcb->WrIndex.bits.val - 6, + etdev->TxRing.pTxDescRingVa + + INDEX10(pMpTcb->WrIndex) - 6, sizeof(TX_DESC_ENTRY_t) * 10); } - spin_unlock_irqrestore(&pAdapter->TCBSendQLock, - lockflags); - - DBG_WARNING(et131x_dbginfo, - "Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n", - pMpTcb->WrIndex.bits.val, - pMpTcb->Flags); - - DBG_WARNING(et131x_dbginfo, - "pDesc 0x%08x, 0x%08x, 0x%08x, 0x%08x\n", - pDesc->DataBufferPtrHigh, - pDesc->DataBufferPtrLow, pDesc->word2.value, - pDesc->word3.value); - - DBG_WARNING(et131x_dbginfo, - "WbStatus 0x%08x\n", txDmaComplete.value); - -#ifdef CONFIG_ET131X_DEBUG - DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 0); - DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 1); - DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 3); - DumpDeviceBlock(DBG_WARNING_ON, pAdapter, 5); -#endif + spin_unlock_irqrestore(&etdev->TCBSendQLock, + flags); + + dev_warn(&etdev->pdev->dev, + "Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n", + pMpTcb->WrIndex, + pMpTcb->Flags); + et131x_close(netdev); et131x_open(netdev); @@ -688,7 +571,7 @@ void et131x_tx_timeout(struct net_device *netdev) } } - spin_unlock_irqrestore(&pAdapter->TCBSendQLock, lockflags); + spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); } /** @@ -703,13 +586,9 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) int result = 0; struct et131x_adapter *adapter = netdev_priv(netdev); - DBG_ENTER(et131x_dbginfo); - /* Make sure the requested MTU is valid */ - if (new_mtu == 0 || new_mtu > 9216) { - DBG_LEAVE(et131x_dbginfo); + if (new_mtu < 64 || new_mtu > 9216) return -EINVAL; - } /* Stop the netif queue */ netif_stop_queue(netdev); @@ -736,8 +615,8 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) /* Alloc and init Rx DMA memory */ result = et131x_adapter_memory_alloc(adapter); if (result != 0) { - DBG_WARNING(et131x_dbginfo, - "Change MTU failed; couldn't re-alloc DMA memory\n"); + dev_warn(&adapter->pdev->dev, + "Change MTU failed; couldn't re-alloc DMA memory\n"); return result; } @@ -750,9 +629,8 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) et131x_adapter_setup(adapter); /* Enable interrupts */ - if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) { + if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE) et131x_enable_interrupts(adapter); - } /* Restart the Tx and Rx DMA engines */ et131x_rx_dma_enable(adapter); @@ -760,8 +638,6 @@ int et131x_change_mtu(struct net_device *netdev, int new_mtu) /* Restart the netif queue */ netif_wake_queue(netdev); - - DBG_LEAVE(et131x_dbginfo); return result; } @@ -780,20 +656,14 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) struct et131x_adapter *adapter = netdev_priv(netdev); struct sockaddr *address = new_mac; - DBG_ENTER(et131x_dbginfo); - // begin blux - // DBG_VERBOSE( et131x_dbginfo, "Function not implemented!!\n" ); + /* begin blux */ - if (adapter == NULL) { - DBG_LEAVE(et131x_dbginfo); + if (adapter == NULL) return -ENODEV; - } /* Make sure the requested MAC is valid */ - if (!is_valid_ether_addr(address->sa_data)) { - DBG_LEAVE(et131x_dbginfo); + if (!is_valid_ether_addr(address->sa_data)) return -EINVAL; - } /* Stop the netif queue */ netif_stop_queue(netdev); @@ -808,46 +678,47 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) et131x_handle_recv_interrupt(adapter); /* Set the new MAC */ - // netdev->set_mac_address = &new_mac; - // netdev->mtu = new_mtu; + /* netdev->set_mac_address = &new_mac; */ + /* netdev->mtu = new_mtu; */ memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len); - printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", - netdev->name, netdev->dev_addr[0], netdev->dev_addr[1], - netdev->dev_addr[2], netdev->dev_addr[3], netdev->dev_addr[4], - netdev->dev_addr[5]); + printk(KERN_INFO + "%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", + netdev->name, + netdev->dev_addr[0], netdev->dev_addr[1], + netdev->dev_addr[2], netdev->dev_addr[3], + netdev->dev_addr[4], netdev->dev_addr[5]); /* Free Rx DMA memory */ et131x_adapter_memory_free(adapter); /* Set the config parameter for Jumbo Packet support */ - // adapter->RegistryJumboPacket = new_mtu + 14; - // blux: not needet here, w'll change the MAC + /* adapter->RegistryJumboPacket = new_mtu + 14; */ + /* blux: not needet here, we'll change the MAC */ et131x_soft_reset(adapter); /* Alloc and init Rx DMA memory */ result = et131x_adapter_memory_alloc(adapter); if (result != 0) { - DBG_WARNING(et131x_dbginfo, - "Change MAC failed; couldn't re-alloc DMA memory\n"); + dev_err(&adapter->pdev->dev, + "Change MAC failed; couldn't re-alloc DMA memory\n"); return result; } et131x_init_send(adapter); et131x_setup_hardware_properties(adapter); - // memcpy( netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN ); - // blux: no, do not override our nice address + /* memcpy( netdev->dev_addr, adapter->CurrentAddress, ETH_ALEN ); */ + /* blux: no, do not override our nice address */ /* Init the device with the new settings */ et131x_adapter_setup(adapter); /* Enable interrupts */ - if (MP_TEST_FLAG(adapter, fMP_ADAPTER_INTERRUPT_IN_USE)) { + if (adapter->Flags & fMP_ADAPTER_INTERRUPT_IN_USE) et131x_enable_interrupts(adapter); - } /* Restart the Tx and Rx DMA engines */ et131x_rx_dma_enable(adapter); @@ -855,7 +726,5 @@ int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) /* Restart the netif queue */ netif_wake_queue(netdev); - - DBG_LEAVE(et131x_dbginfo); return result; } |