merge r13720 to 8.09

[openwrt/svn-archive/archive.git] / target / linux / atheros / files / drivers / net / ar2313 / ar2313.c

diff --git a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
index 4e3c1d64c8cbe258d710b31bd729d92dce457de3..995325a9136b86384d7bf469b6548180220ce52a 100644 (file)
--- a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
+++ b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
@@ -219,7 +219,7 @@ int __init ar2313_probe(struct platform_device *pdev)
        dev->do_ioctl = &ar2313_ioctl;
 
        // SAMEER: do we need this?
-       dev->features |= NETIF_F_SG | NETIF_F_HIGHDMA;
+       dev->features |= NETIF_F_HIGHDMA;
 
        tasklet_init(&sp->rx_tasklet, rx_tasklet_func, (unsigned long) dev);
        tasklet_disable(&sp->rx_tasklet);
@@ -826,7 +826,7 @@ static int ar2313_init(struct net_device *dev)
 static void ar2313_load_rx_ring(struct net_device *dev, int nr_bufs)
 {
 
-       struct ar2313_private *sp = ((struct net_device *) dev)->priv;
+       struct ar2313_private *sp = netdev_priv(dev);
        short i, idx;
 
        idx = sp->rx_skbprd;
@@ -1121,6 +1121,9 @@ static int ar2313_open(struct net_device *dev)
 {
        struct ar2313_private *sp = netdev_priv(dev);
 
+       /* reset the hardware, in case the MAC address changed */
+       ar2313_reset_reg(dev);
+
        dev->mtu = 1500;
        netif_start_queue(dev);