Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / wireless / libertas / main.c

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 598080414b173654f25fb6d4767298b23462b865..38edad6f24b84caeb464a743d9b507a55384be9c 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -319,7 +319,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
                               struct net_device *dev, int nr_addrs)
 {
        int i = nr_addrs;
-       struct dev_mc_list *mc_list;
+       struct netdev_hw_addr *ha;
        int cnt;
 
        if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST))
@@ -327,19 +327,19 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
 
        netif_addr_lock_bh(dev);
        cnt = netdev_mc_count(dev);
-       netdev_for_each_mc_addr(mc_list, dev) {
-               if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) {
+       netdev_for_each_mc_addr(ha, dev) {
+               if (mac_in_list(cmd->maclist, nr_addrs, ha->addr)) {
                        lbs_deb_net("mcast address %s:%pM skipped\n", dev->name,
-                                   mc_list->dmi_addr);
+                                   ha->addr);
                        cnt--;
                        continue;
                }
 
                if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE)
                        break;
-               memcpy(&cmd->maclist[6*i], mc_list->dmi_addr, ETH_ALEN);
+               memcpy(&cmd->maclist[6*i], ha->addr, ETH_ALEN);
                lbs_deb_net("mcast address %s:%pM added to filter\n", dev->name,
-                           mc_list->dmi_addr);
+                           ha->addr);
                i++;
                cnt--;
        }
@@ -836,6 +836,7 @@ static int lbs_init_adapter(struct lbs_private *priv)
        priv->is_auto_deep_sleep_enabled = 0;
        priv->wakeup_dev_required = 0;
        init_waitqueue_head(&priv->ds_awake_q);
+       priv->authtype_auto = 1;
 
        mutex_init(&priv->lock);