On 1/26/2012 4:36 AM, Nicolas Cavallari wrote:

-	if (ifibss->fixed_channel)
+	if (ifibss->fixed_bssid)
  		return;

  	printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
  	       "IBSS networks with same SSID (merge)\n", sdata->name);

Just from the looks of it, this doesn't seem right. If you're fixing the 
BSSID, you're still asking for automatic channel selection and merging 
with other peers using the same BSSID on different channels, so I 
disagree with your commit message quite completely.

johannes