b43: add hardware tkip

[karo-tx-linux.git] / drivers / net / wireless / arlan-main.c

diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index a54a67c425c8f7e02e401b255fb2d2ef3123846f..f96c634e2d35f2e6ee678081d6ab80018980bfcc 100644 (file)
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1022,7 +1022,7 @@ static int arlan_mac_addr(struct net_device *dev, void *p)
        ARLAN_DEBUG_ENTRY("arlan_mac_addr");
        return -EINVAL;
 
-       if (!netif_running(dev))
+       if (netif_running(dev))
                return -EBUSY;
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
@@ -1193,13 +1193,13 @@ static int arlan_tx(struct sk_buff *skb, struct net_device *dev)
 
        arlan_process_interrupt(dev);
        ARLAN_DEBUG_EXIT("arlan_tx");
-       return 0;
+       return NETDEV_TX_OK;
 
 bad_end:
        arlan_process_interrupt(dev);
        netif_stop_queue (dev);
        ARLAN_DEBUG_EXIT("arlan_tx");
-       return 1;
+       return NETDEV_TX_BUSY;
 }