X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d63beb8f0c1e496ebc2a9c568d13233acdafa82f..8968bee891bde44ddcd93d31980b5f3dda60c80a:/target/linux/adm5120/files/drivers/net/adm5120sw.c diff --git a/target/linux/adm5120/files/drivers/net/adm5120sw.c b/target/linux/adm5120/files/drivers/net/adm5120sw.c index 8f3610e90..a92695485 100644 --- a/target/linux/adm5120/files/drivers/net/adm5120sw.c +++ b/target/linux/adm5120/files/drivers/net/adm5120sw.c @@ -1,7 +1,7 @@ /* * ADM5120 built-in ethernet switch driver * - * Copyright (C) 2007,2008 Gabor Juhos + * Copyright (C) 2007-2008 Gabor Juhos * * This code was based on a driver for Linux 2.6.xx by Jeroen Vreeken. * Copyright Jeroen Vreeken (pe1rxq@amsat.org), 2005 @@ -24,20 +24,18 @@ #include #include #include +#include +#include #include #include #include -#include -#include - #include -#include -#include -#include -#include +#include +#include +#include #include "adm5120sw.h" @@ -66,7 +64,7 @@ #define TX_RING_SIZE 32 #define TX_QUEUE_LEN 28 /* Limit ring entries actually used. */ -#define TX_TIMEOUT HZ*400 +#define TX_TIMEOUT (HZ * 400) #define RX_DESCS_SIZE (RX_RING_SIZE * sizeof(struct dma_desc *)) #define RX_SKBS_SIZE (RX_RING_SIZE * sizeof(struct sk_buff *)) @@ -234,7 +232,7 @@ static void sw_dump_desc(char *label, struct dma_desc *desc, int tx) t = desc->buf2; SW_DBG(" buf2 %08X addr=%08X%s\n", desc->buf2, t & DESC_ADDR_MASK, - (t & DESC_BUF2_EN) ? " EN" : "" ); + (t & DESC_BUF2_EN) ? " EN" : ""); t = desc->misc; if (tx) @@ -519,7 +517,7 @@ static int adm5120_if_poll(struct napi_struct *napi, int limit) status = sw_int_status() & SWITCH_INTS_POLL; if ((done < limit) && (!status)) { SW_DBG("disable polling mode for %s\n", dev->name); - netif_rx_complete(dev, napi); + napi_complete(napi); sw_int_unmask(SWITCH_INTS_POLL); return 0; } @@ -550,18 +548,16 @@ static irqreturn_t adm5120_switch_irq(int irq, void *dev_id) sw_dump_intr_mask("poll ints", status); SW_DBG("enable polling mode for %s\n", dev->name); sw_int_mask(SWITCH_INTS_POLL); - netif_rx_schedule(dev, &priv->napi); + napi_schedule(&priv->napi); } #else sw_int_ack(status); - if (status & (SWITCH_INT_RLD | SWITCH_INT_LDF)) { + if (status & (SWITCH_INT_RLD | SWITCH_INT_LDF)) adm5120_switch_rx(RX_RING_SIZE); - } - if (status & SWITCH_INT_SLD) { + if (status & SWITCH_INT_SLD) adm5120_switch_tx(); - } #endif return IRQ_HANDLED; @@ -591,7 +587,7 @@ static void adm5120_switch_tx_ring_reset(struct dma_desc *desc, { memset(desc, 0, num * sizeof(*desc)); desc[num-1].buf1 |= DESC_EOR; - memset(skbl, 0, sizeof(struct skb*)*num); + memset(skbl, 0, sizeof(struct skb *) * num); cur_txl = 0; dirty_txl = 0; @@ -610,7 +606,7 @@ static void adm5120_switch_rx_ring_reset(struct dma_desc *desc, break; } skb_reserve(skbl[i], SKB_RESERVE_LEN); - adm5120_rx_dma_update(&desc[i], skbl[i], (num-1==i)); + adm5120_rx_dma_update(&desc[i], skbl[i], (num - 1 == i)); } cur_rxl = 0; @@ -723,7 +719,8 @@ static void adm5120_write_mac(struct net_device *dev) sw_write_reg(SWITCH_REG_MAC_WT0, t); - while (!(sw_read_reg(SWITCH_REG_MAC_WT0) & MAC_WT0_MWD)); + while (!(sw_read_reg(SWITCH_REG_MAC_WT0) & MAC_WT0_MWD)) + ; } static void adm5120_set_vlan(char *matrix) @@ -737,9 +734,10 @@ static void adm5120_set_vlan(char *matrix) sw_write_reg(SWITCH_REG_VLAN_G2, val); /* Now set/update the port vs. device lookup table */ - for (port=0; portirq, adm5120_switch_irq, - (IRQF_SHARED | IRQF_DISABLED), dev->name, dev); + err = request_irq(dev->irq, adm5120_switch_irq, IRQF_SHARED, + dev->name, dev); if (err) { SW_ERR("unable to get irq for %s\n", dev->name); goto err; @@ -893,7 +891,7 @@ static int adm5120_if_hard_start_xmit(struct sk_buff *skb, data |= DESC_ADDR(skb->data); desc->misc = - ((skb->lenlen) << DESC_PKTLEN_SHIFT) | + ((skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len) << DESC_PKTLEN_SHIFT) | (0x1 << priv->vlan_no); desc->buflen = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len; @@ -919,7 +917,7 @@ static int adm5120_if_hard_start_xmit(struct sk_buff *skb, static void adm5120_if_tx_timeout(struct net_device *dev) { - SW_INFO("TX timeout on %s\n",dev->name); + SW_INFO("TX timeout on %s\n", dev->name); } static void adm5120_if_set_multicast_list(struct net_device *dev) @@ -964,10 +962,10 @@ static void adm5120_if_set_multicast_list(struct net_device *dev) /* to the CPU, the Bridge Test Mode has to be activated. */ /* Check if there is any vlan in promisc mode. */ - if (t & (SWITCH_PORTS_NOCPU << CPUP_CONF_DUNP_SHIFT)) - t &= ~CPUP_CONF_BTM; /* Disable Bridge Testing Mode */ - else + if (~t & (SWITCH_PORTS_NOCPU << CPUP_CONF_DUNP_SHIFT)) t |= CPUP_CONF_BTM; /* Enable Bridge Testing Mode */ + else + t &= ~CPUP_CONF_BTM; /* Disable Bridge Testing Mode */ sw_write_reg(SWITCH_REG_CPUP_CONF, t); @@ -975,9 +973,12 @@ static void adm5120_if_set_multicast_list(struct net_device *dev) static int adm5120_if_set_mac_address(struct net_device *dev, void *p) { - struct sockaddr *addr = p; + int ret; + + ret = eth_mac_addr(dev, p); + if (ret) + return ret; - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); adm5120_write_mac(dev); return 0; } @@ -989,7 +990,7 @@ static int adm5120_if_do_ioctl(struct net_device *dev, struct ifreq *rq, struct adm5120_sw_info info; struct adm5120_if_priv *priv = netdev_priv(dev); - switch(cmd) { + switch (cmd) { case SIOCGADMINFO: info.magic = 0x5120; info.ports = adm5120_nrdevs; @@ -1019,6 +1020,18 @@ static int adm5120_if_do_ioctl(struct net_device *dev, struct ifreq *rq, return 0; } +static const struct net_device_ops adm5120sw_netdev_ops = { + .ndo_open = adm5120_if_open, + .ndo_stop = adm5120_if_stop, + .ndo_start_xmit = adm5120_if_hard_start_xmit, + .ndo_set_multicast_list = adm5120_if_set_multicast_list, + .ndo_do_ioctl = adm5120_if_do_ioctl, + .ndo_tx_timeout = adm5120_if_tx_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = adm5120_if_set_mac_address, +}; + static struct net_device *adm5120_if_alloc(void) { struct net_device *dev; @@ -1032,14 +1045,8 @@ static struct net_device *adm5120_if_alloc(void) priv->dev = dev; dev->irq = ADM5120_IRQ_SWITCH; - dev->open = adm5120_if_open; - dev->hard_start_xmit = adm5120_if_hard_start_xmit; - dev->stop = adm5120_if_stop; - dev->set_multicast_list = adm5120_if_set_multicast_list; - dev->do_ioctl = adm5120_if_do_ioctl; - dev->tx_timeout = adm5120_if_tx_timeout; - dev->watchdog_timeo = TX_TIMEOUT; - dev->set_mac_address = adm5120_if_set_mac_address; + dev->netdev_ops = &adm5120sw_netdev_ops; + dev->watchdog_timeo = TX_TIMEOUT; #ifdef CONFIG_ADM5120_SWITCH_NAPI netif_napi_add(dev, &priv->napi, adm5120_if_poll, 64); @@ -1200,6 +1207,6 @@ module_init(adm5120_switch_mod_init); module_exit(adm5120_switch_mod_exit); MODULE_LICENSE("GPL v2"); -MODULE_AUTHOR("Gabor Juhos "); +MODULE_AUTHOR("Gabor Juhos "); MODULE_DESCRIPTION(DRV_DESC); MODULE_VERSION(DRV_VERSION);