[package] iwinfo: factor txpower offset into info display output, recompile if driver...

[openwrt.git] / 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 7acc84d..a926954 100644 (file)
--- a/target/linux/adm5120/files/drivers/net/adm5120sw.c
+++ b/target/linux/adm5120/files/drivers/net/adm5120sw.c
@@ -64,7 +64,7 @@
 
 #define TX_RING_SIZE   32
 #define TX_QUEUE_LEN   28      /* Limit ring entries actually used. */
 
 #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 *))
 
 #define RX_DESCS_SIZE  (RX_RING_SIZE * sizeof(struct dma_desc *))
 #define RX_SKBS_SIZE   (RX_RING_SIZE * sizeof(struct sk_buff *))


@@ -232,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;
        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)
 
        t = desc->misc;
        if (tx)


@@ -517,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);
        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;
        }
                sw_int_unmask(SWITCH_INTS_POLL);
                return 0;
        }


@@ -548,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);
                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);
 
        }
 #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);
                adm5120_switch_rx(RX_RING_SIZE);

-       }

 
 

-       if (status & SWITCH_INT_SLD) {
+       if (status & SWITCH_INT_SLD)

                adm5120_switch_tx();
                adm5120_switch_tx();

-       }

 #endif
 
        return IRQ_HANDLED;
 #endif
 
        return IRQ_HANDLED;


@@ -589,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(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;
 
        cur_txl = 0;
        dirty_txl = 0;


@@ -608,7 +606,7 @@ static void adm5120_switch_rx_ring_reset(struct dma_desc *desc,
                        break;
                }
                skb_reserve(skbl[i], SKB_RESERVE_LEN);
                        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;
        }
 
        cur_rxl = 0;


@@ -721,7 +719,8 @@ static void adm5120_write_mac(struct net_device *dev)
 
        sw_write_reg(SWITCH_REG_MAC_WT0, t);
 
 
        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)
 }
 
 static void adm5120_set_vlan(char *matrix)


@@ -735,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 */
        sw_write_reg(SWITCH_REG_VLAN_G2, val);
 
        /* Now set/update the port vs. device lookup table */

-       for (port=0; port<SWITCH_NUM_PORTS; port++) {
-               for (vlan_port=0; vlan_port<SWITCH_NUM_PORTS && !(matrix[vlan_port] & (0x00000001 << port)); vlan_port++);
-               if (vlan_port <SWITCH_NUM_PORTS)
+       for (port = 0; port < SWITCH_NUM_PORTS; port++) {
+               for (vlan_port = 0; vlan_port < SWITCH_NUM_PORTS && !(matrix[vlan_port] & (0x00000001 << port)); vlan_port++)
+                       ;
+               if (vlan_port < SWITCH_NUM_PORTS)

                        adm5120_port[port] = adm5120_devs[vlan_port];
                else
                        adm5120_port[port] = NULL;
                        adm5120_port[port] = adm5120_devs[vlan_port];
                else
                        adm5120_port[port] = NULL;


@@ -808,8 +808,8 @@ static int adm5120_if_open(struct net_device *dev)
 
        adm5120_if_napi_enable(dev);
 
 
        adm5120_if_napi_enable(dev);
 

-       err = request_irq(dev->irq, 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;
        if (err) {
                SW_ERR("unable to get irq for %s\n", dev->name);
                goto err;


@@ -891,7 +891,7 @@ static int adm5120_if_hard_start_xmit(struct sk_buff *skb,
        data |= DESC_ADDR(skb->data);
 
        desc->misc =
        data |= DESC_ADDR(skb->data);
 
        desc->misc =

-           ((skb->len<ETH_ZLEN?ETH_ZLEN:skb->len) << 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;
            (0x1 << priv->vlan_no);
 
        desc->buflen = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;


@@ -917,7 +917,7 @@ static int adm5120_if_hard_start_xmit(struct sk_buff *skb,
 
 static void adm5120_if_tx_timeout(struct net_device *dev)
 {
 
 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)
 }
 
 static void adm5120_if_set_multicast_list(struct net_device *dev)


@@ -962,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. */
        /* 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 */
                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);
 
 
        sw_write_reg(SWITCH_REG_CPUP_CONF, t);
 


@@ -973,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)
 {
 
 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;
 }
        adm5120_write_mac(dev);
        return 0;
 }


@@ -987,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);
 
        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;
        case SIOCGADMINFO:
                info.magic = 0x5120;
                info.ports = adm5120_nrdevs;


@@ -1017,6 +1020,18 @@ static int adm5120_if_do_ioctl(struct net_device *dev, struct ifreq *rq,
        return 0;
 }
 
        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;
 static struct net_device *adm5120_if_alloc(void)
 {
        struct net_device *dev;


@@ -1030,14 +1045,8 @@ static struct net_device *adm5120_if_alloc(void)
        priv->dev = dev;
 
        dev->irq                = ADM5120_IRQ_SWITCH;
        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);
 
 #ifdef CONFIG_ADM5120_SWITCH_NAPI
        netif_napi_add(dev, &priv->napi, adm5120_if_poll, 64);