xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h
This commit is contained in:
John W. Linville
2010-07-27 11:59:19 -04:00
parent 06b3cda0c1 b3190df628
commit 800f65bba8
4739 changed files with 325713 additions and 140186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/net/cfg80211.h
View File

@@ -1358,26 +1358,15 @@ struct wiphy {
char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
};
#ifdef CONFIG_NET_NS
static inline struct net *wiphy_net(struct wiphy *wiphy)
{
return wiphy->_net;
return read_pnet(&wiphy->_net);
}
static inline void wiphy_net_set(struct wiphy *wiphy, struct net *net)
{
wiphy->_net = net;
write_pnet(&wiphy->_net, net);
}
#else
static inline struct net *wiphy_net(struct wiphy *wiphy)
{
return &init_net;
}
static inline void wiphy_net_set(struct wiphy *wiphy, struct net *net)
{
}
#endif
/**
* wiphy_priv - return priv from wiphy