← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lts-quantal/precise-updates

« back to all changes in this revision

Viewing changes to net/mac80211/ibss.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Luis Henriques, Tim Gardner
  • Date: 2013-02-07 12:08:38 UTC
  • Revision ID: package-import@ubuntu.com-20130207120838-8jaukepmb85dkevq
Tags: 3.5.0-24.37~precise1
https://launchpad.net/bugs/1118287
https://launchpad.net/bugs/927782
[Luis Henriques]

* Release Tracking Bug
  - LP: #1118287

[ Tim Gardner ]

* [Config] CONFIG_ALX=m for x86 only
  - LP: #927782

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/mac80211/ibss.c
665
665
        printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
666
666
               "IBSS networks with same SSID (merge)\n", sdata->name);
667
667
 
668
 
        ieee80211_request_internal_scan(sdata,
669
 
                        ifibss->ssid, ifibss->ssid_len, NULL);
 
668
        ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len,
 
669
                                    NULL);
670
670
}
671
671
 
672
672
static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
773
773
                printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
774
774
                       "join\n", sdata->name);
775
775
 
776
 
                ieee80211_request_internal_scan(sdata,
777
 
                                ifibss->ssid, ifibss->ssid_len,
778
 
                                ifibss->fixed_channel ? ifibss->channel : NULL);
 
776
                ieee80211_request_ibss_scan(sdata, ifibss->ssid,
 
777
                                            ifibss->ssid_len, chan);
779
778
        } else {
780
779
                int interval = IEEE80211_SCAN_INTERVAL;
781
780