[adm5120] fix switch driver, force all packets from all the ports are low priority

[openwrt.git] / target / linux / adm5120-2.6 / files / drivers / net / adm5120sw.c

diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
index 83a311f..2714577 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
@@ -262,7 +262,7 @@ static int adm5120_sw_open(struct net_device *dev)
 {
        unsigned long val;
        int i;
 {
        unsigned long val;
        int i;

-       
+

        netif_start_queue(dev);
        if (!adm5120_if_open++) {
                /* enable interrupts on first open */
        netif_start_queue(dev);
        if (!adm5120_if_open++) {
                /* enable interrupts on first open */


@@ -284,7 +284,7 @@ static int adm5120_sw_stop(struct net_device *dev)
 {
        unsigned long val;
        int i;
 {
        unsigned long val;
        int i;

-       
+

        if (!--adm5120_if_open) {
                adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL);
        }
        if (!--adm5120_if_open) {
                adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL);
        }


@@ -321,7 +321,7 @@ static int adm5120_sw_tx(struct sk_buff *skb, struct net_device *dev)
        dma->status =
            ((skb->len<ETH_ZLEN?ETH_ZLEN:skb->len) << ADM5120_DMA_LENSHIFT) |
            (0x1 << priv->port);
        dma->status =
            ((skb->len<ETH_ZLEN?ETH_ZLEN:skb->len) << ADM5120_DMA_LENSHIFT) |
            (0x1 << priv->port);

-       
+

        dma->len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
        priv->stats.tx_packets++;
        priv->stats.tx_bytes += skb->len;
        dma->len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
        priv->stats.tx_packets++;
        priv->stats.tx_bytes += skb->len;


@@ -537,6 +537,9 @@ static int __init adm5120_sw_init(void)
        adm5120_set_reg(ADM5120_PHY_CNTL3, adm5120_get_reg(ADM5120_PHY_CNTL3) |
            ADM5120_PHY_NTH);
 
        adm5120_set_reg(ADM5120_PHY_CNTL3, adm5120_get_reg(ADM5120_PHY_CNTL3) |
            ADM5120_PHY_NTH);
 

+       /* Force all the packets from all ports are low priority */
+       adm5120_set_reg(ADM5120_PRI_CNTL, 0);
+

        adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL);
        adm5120_set_reg(ADM5120_INT_ST, ADM5120_INTMASKALL);
 
        adm5120_set_reg(ADM5120_INT_MASK, ADM5120_INTMASKALL);
        adm5120_set_reg(ADM5120_INT_ST, ADM5120_INTMASKALL);
 


@@ -554,7 +557,7 @@ static int __init adm5120_sw_init(void)
        adm5120_set_reg(ADM5120_RECEIVE_HBADDR, KSEG1ADDR(adm5120_dma_rxh));
        adm5120_set_reg(ADM5120_RECEIVE_LBADDR, KSEG1ADDR(adm5120_dma_rxl));
 
        adm5120_set_reg(ADM5120_RECEIVE_HBADDR, KSEG1ADDR(adm5120_dma_rxh));
        adm5120_set_reg(ADM5120_RECEIVE_LBADDR, KSEG1ADDR(adm5120_dma_rxl));
 

-       for (i=0; i<adm5120_nrdevs; i++) {
+       for (i = 0; i < SW_DEVS; i++) {

                adm5120_devs[i] = alloc_etherdev(sizeof(struct adm5120_sw));
                if (!adm5120_devs[i]) {
                        err = -ENOMEM;
                adm5120_devs[i] = alloc_etherdev(sizeof(struct adm5120_sw));
                if (!adm5120_devs[i]) {
                        err = -ENOMEM;


@@ -612,9 +615,9 @@ static void __exit adm5120_sw_exit(void)
 {
        int i;
 
 {
        int i;
 

-       for (i = 0; i < adm5120_nrdevs; i++) {
+       for (i = 0; i < SW_DEVS; i++) {

                unregister_netdev(adm5120_devs[i]);
                unregister_netdev(adm5120_devs[i]);

-               free_netdev(adm5120_devs[i-1]);
+               free_netdev(adm5120_devs[i]);

        }
 
        free_irq(ADM5120_IRQ_SWITCH, NULL);
        }
 
        free_irq(ADM5120_IRQ_SWITCH, NULL);