Merge branch 'origin'

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 4c28e332ecc3..916b24c544e2 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -8012,6 +8012,10 @@ static int ipw_sw_reset(struct ipw_priv *priv, int init)
         else
                 IPW_DEBUG_INFO("Auto adhoc creation disabled.\n");
 
+        priv->config &= ~CFG_STATIC_ESSID;
+        priv->essid_len = 0;
+        memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
+
         if (disable) {
                 priv->status |= STATUS_RF_KILL_SW;
                 IPW_DEBUG_INFO("Radio disabled.\n");
@@ -11035,7 +11039,6 @@ static int ipw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         net_dev->set_multicast_list = ipw_net_set_multicast_list;
         net_dev->set_mac_address = ipw_net_set_mac_address;
         priv->wireless_data.spy_data = &priv->ieee->spy_data;
-        priv->wireless_data.ieee80211 = priv->ieee;
         net_dev->wireless_data = &priv->wireless_data;
         net_dev->wireless_handlers = &ipw_wx_handler_def;
         net_dev->ethtool_ops = &ipw_ethtool_ops;
@@ -11121,8 +11124,8 @@ static void ipw_pci_remove(struct pci_dev *pdev)
         /* Free MAC hash list for ADHOC */
         for (i = 0; i < IPW_IBSS_MAC_HASH_SIZE; i++) {
                 list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
-                        kfree(list_entry(p, struct ipw_ibss_seq, list));
                         list_del(p);
+                        kfree(list_entry(p, struct ipw_ibss_seq, list));
                 }
         }