← Back to branch summary

~ubuntu-branches/ubuntu/utopic/linux-backports-modules-3.2.0/utopic

« back to all changes in this revision

Viewing changes to updates/cw-3.3/drivers/net/wireless/mwifiex/cfg80211.c

  • Committer: Package Import Robot
  • Author(s): Leann Ogasawara
  • Date: 2012-03-16 08:54:19 UTC
  • Revision ID: package-import@ubuntu.com-20120316085419-2su2uxghzxg95ggi
Tags: 3.2.0-19.2
* Update to compat-wireless-3.3-rc6-1-n
* Bump ABI for Precise 3.2.0-19.30 

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/cw-3.3/drivers/net/wireless/mwifiex/cfg80211.c
841
841
                ret = mwifiex_set_rf_channel(priv, channel,
842
842
                                                priv->adapter->channel_type);
843
843
 
844
 
        ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);  /* Disable keys */
 
844
        /* As this is new association, clear locally stored
 
845
         * keys and security related flags */
 
846
        priv->sec_info.wpa_enabled = false;
 
847
        priv->sec_info.wpa2_enabled = false;
 
848
        priv->wep_key_curr_index = 0;
 
849
        ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);
845
850
 
846
851
        if (mode == NL80211_IFTYPE_ADHOC) {
847
852
                /* "privacy" is set only for ad-hoc mode */
886
891
                        dev_dbg(priv->adapter->dev,
887
892
                                "info: setting wep encryption"
888
893
                                " with key len %d\n", sme->key_len);
 
894
                        priv->wep_key_curr_index = sme->key_idx;
889
895
                        ret = mwifiex_set_encode(priv, sme->key, sme->key_len,
890
896
                                                        sme->key_idx, 0);
891
897
                }