From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Mar 2013 20:41:36 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: firefly_0821_release~3680^2~478^2~21^2^2~189
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a574cd67a447059f9c14bbef47873315d7f7b35;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h
---

9a574cd67a447059f9c14bbef47873315d7f7b35
diff --cc net/wireless/core.h
index d5d06fdea961,5845c2b37aa8..124e5e773fbc
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@@ -500,9 -503,9 +500,12 @@@ int cfg80211_validate_beacon_int(struc
  void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev,
  			       enum nl80211_iftype iftype, int num);
  
 +void cfg80211_leave(struct cfg80211_registered_device *rdev,
 +		    struct wireless_dev *wdev);
 +
+ void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,
+ 			      struct wireless_dev *wdev);
+ 
  #define CFG80211_MAX_NUM_DIFFERENT_CHANNELS 10
  
  #ifdef CONFIG_CFG80211_DEVELOPER_WARNINGS