6 files changed, 25 insertions, 42 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 0c1209390169..faec40467208 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -2673,8 +2673,6 @@ il3945_bg_restart(struct work_struct *data)
 
         if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
                 mutex_lock(&il->mutex);
-                /* FIXME: vif can be dereferenced */
-                il->vif = NULL;
                 il->is_open = 0;
                 mutex_unlock(&il->mutex);
                 il3945_down(il);
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c
index 70bee1a4d876..4b10157d8686 100644
--- a/drivers/net/wireless/iwlegacy/3945-rs.c
+++ b/drivers/net/wireless/iwlegacy/3945-rs.c
@@ -821,12 +821,6 @@ out:
 }
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il3945_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 static ssize_t
 il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
@@ -862,7 +856,7 @@ il3945_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
         .read = il3945_sta_dbgfs_stats_table_read,
-        .open = il3945_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 17f1c6853182..c46275a92565 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5652,8 +5652,6 @@ il4965_bg_restart(struct work_struct *data)
 
         if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
                 mutex_lock(&il->mutex);
-                /* FIXME: do we dereference vif without mutex locked ? */
-                il->vif = NULL;
                 il->is_open = 0;
 
                 __il4965_down(il);
diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index d7e2856e41d3..11ab1247fae1 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -2518,12 +2518,6 @@ il4965_rs_free_sta(void *il_r, struct ieee80211_sta *sta, void *il_sta)
 }
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-static int
-il4965_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 static void
 il4965_rs_dbgfs_set_mcs(struct il_lq_sta *lq_sta, u32 * rate_n_flags, int idx)
@@ -2695,7 +2689,7 @@ il4965_rs_sta_dbgfs_scale_table_read(struct file *file, char __user *user_buf,
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
         .write = il4965_rs_sta_dbgfs_scale_table_write,
         .read = il4965_rs_sta_dbgfs_scale_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -2740,7 +2734,7 @@ il4965_rs_sta_dbgfs_stats_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
         .read = il4965_rs_sta_dbgfs_stats_table_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
@@ -2768,7 +2762,7 @@ il4965_rs_sta_dbgfs_rate_scale_data_read(struct file *file,
 
 static const struct file_operations rs_sta_dbgfs_rate_scale_data_ops = {
         .read = il4965_rs_sta_dbgfs_rate_scale_data_read,
-        .open = il4965_open_file_generic,
+        .open = simple_open,
         .llseek = default_llseek,
 };
 
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index e5ac04739bcc..eaf249452e51 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4508,6 +4508,7 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
         struct il_priv *il = hw->priv;
         int err;
+        bool reset;
 
         mutex_lock(&il->mutex);
         D_MAC80211("enter: type %d, addr %pM\n", vif->type, vif->addr);
@@ -4518,7 +4519,12 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
                 goto out;
         }
 
-        if (il->vif) {
+        /*
+         * We do not support multiple virtual interfaces, but on hardware reset
+         * we have to add the same interface again.
+         */
+        reset = (il->vif == vif);
+        if (il->vif && !reset) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
@@ -4528,8 +4534,11 @@ il_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
         err = il_set_mode(il);
         if (err) {
-                il->vif = NULL;
-                il->iw_mode = NL80211_IFTYPE_STATION;
+                IL_WARN("Fail to set mode %d\n", vif->type);
+                if (!reset) {
+                        il->vif = NULL;
+                        il->iw_mode = NL80211_IFTYPE_STATION;
+                }
         }
 
 out:
@@ -5279,9 +5288,9 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 D_MAC80211("BSSID %pM\n", bss_conf->bssid);
 
                 /*
-                 * If there is currently a HW scan going on in the
-                 * background then we need to cancel it else the RXON
-                 * below/in post_associate will fail.
+                 * If there is currently a HW scan going on in the background,
+                 * then we need to cancel it, otherwise sometimes we are not
+                 * able to authenticate (FIXME: why ?)
                  */
                 if (il_scan_cancel_timeout(il, 100)) {
                         D_MAC80211("leave - scan abort failed\n");
@@ -5290,14 +5299,10 @@ il_mac_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 }
 
                 /* mac80211 only sets assoc when in STATION mode */
-                if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
-                        memcpy(il->staging.bssid_addr, bss_conf->bssid,
-                               ETH_ALEN);
+                memcpy(il->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);
 
-                        /* currently needed in a few places */
-                        memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
-                } else
-                        il->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+                /* FIXME: currently needed in a few places */
+                memcpy(il->bssid, bss_conf->bssid, ETH_ALEN);
         }
 
         /*
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index 229849150aac..eff26501d60a 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -160,18 +160,12 @@ static ssize_t il_dbgfs_##name##_write(struct file *file,              \
                                         const char __user *user_buf,    \
                                         size_t count, loff_t *ppos);
 
-static int
-il_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
 
 #define DEBUGFS_READ_FILE_OPS(name)                             \
         DEBUGFS_READ_FUNC(name);                                \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };
 
@@ -179,7 +173,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
         DEBUGFS_WRITE_FUNC(name);                               \
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .write = il_dbgfs_##name##_write,                       \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };
 
@@ -189,7 +183,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {	\
 static const struct file_operations il_dbgfs_##name##_ops = {   \
         .write = il_dbgfs_##name##_write,                       \
         .read = il_dbgfs_##name##_read,                         \
-        .open = il_dbgfs_open_file_generic,                     \
+        .open = simple_open,                                    \
         .llseek = generic_file_llseek,                          \
 };