← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to net/mac80211/work.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/mac80211/work.c
150
150
                }
151
151
 
152
152
                if (!started && !local->tmp_channel) {
153
 
                        ieee80211_offchannel_stop_vifs(local, true);
 
153
                        ieee80211_offchannel_stop_vifs(local);
154
154
 
155
155
                        local->tmp_channel = wk->chan;
156
156
                        local->tmp_channel_type = wk->chan_type;
222
222
                local->tmp_channel = NULL;
223
223
                ieee80211_hw_config(local, 0);
224
224
 
225
 
                ieee80211_offchannel_return(local, true);
 
225
                ieee80211_offchannel_return(local);
226
226
 
227
227
                /* give connection some time to breathe */
228
228
                run_again(local, jiffies + HZ/2);