← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to net/mac80211/mlme.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/mac80211/mlme.c
1352
1352
        if (WARN_ON(!ifmgd->associated))
1353
1353
                return;
1354
1354
 
 
1355
        ieee80211_stop_poll(sdata);
 
1356
 
1355
1357
        memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
1356
1358
 
1357
1359
        ifmgd->associated = NULL;
2612
2614
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
2613
2615
        u8 frame_buf[DEAUTH_DISASSOC_LEN];
2614
2616
 
2615
 
        ieee80211_stop_poll(sdata);
2616
 
 
2617
2617
        ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
2618
2618
                               false, frame_buf);
2619
2619
        mutex_unlock(&ifmgd->mtx);