From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Jul 2012 19:21:05 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d07d152892aadd8dc3209ecef6788dfc83475676;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
	drivers/net/wireless/iwmc3200wifi/cfg80211.c
	drivers/net/wireless/mwifiex/cfg80211.c
---

d07d152892aadd8dc3209ecef6788dfc83475676
diff --cc drivers/net/wireless/mwifiex/cfg80211.c
index 6c57e832ae83,6ca571a1b8e2..e27b3168862c
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@@ -1701,7 -1635,13 +1702,7 @@@ struct wireless_dev *mwifiex_add_virtua
  #ifdef CONFIG_DEBUG_FS
  	mwifiex_dev_debugfs_init(priv);
  #endif
- 	return dev;
+ 	return wdev;
 -error:
 -	if (dev && (dev->reg_state == NETREG_UNREGISTERED))
 -		free_netdev(dev);
 -	priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
 -
 -	return NULL;
  }
  EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);