Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84efbb84 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: use wireless_dev for interface management 



In order to be able to create P2P Device wdevs, move
the virtual interface management over to wireless_dev
structures.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 71bbc994

drivers/net/wireless/ath/ath6kl/cfg80211.c

+15 −15
Original line number Diff line number Diff line
@@ -1487,14 +1487,14 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, 
	return 0;

}



static struct net_device *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,

static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,

						      char *name,

						      enum nl80211_iftype type,

						      u32 *flags,

						      struct vif_params *params)

{

	struct ath6kl *ar = wiphy_priv(wiphy);

	struct net_device *ndev;

	struct wireless_dev *wdev;

	u8 if_idx, nw_type;



	if (ar->num_vif == ar->vif_max) {
@@ -1507,20 +1507,20 @@ static struct net_device *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, 
		return ERR_PTR(-EINVAL);

	}



	ndev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);

	if (!ndev)

	wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);

	if (!wdev)

		return ERR_PTR(-ENOMEM);



	ar->num_vif++;



	return ndev;

	return wdev;

}



static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy,

				     struct net_device *ndev)

				     struct wireless_dev *wdev)

{

	struct ath6kl *ar = wiphy_priv(wiphy);

	struct ath6kl_vif *vif = netdev_priv(ndev);

	struct ath6kl_vif *vif = netdev_priv(wdev->netdev);



	spin_lock_bh(&ar->list_lock);

	list_del(&vif->list);
@@ -3477,9 +3477,9 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif) 
	ar->num_vif--;

}



struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,

					enum nl80211_iftype type, u8 fw_vif_idx,

					u8 nw_type)

struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type)

{

	struct net_device *ndev;

	struct ath6kl_vif *vif;
@@ -3533,7 +3533,7 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name, 
	list_add_tail(&vif->list, &ar->vif_list);

	spin_unlock_bh(&ar->list_lock);



	return ndev;

	return &vif->wdev;



err:

	aggr_module_destroy(vif->aggr_cntxt);

drivers/net/wireless/ath/ath6kl/cfg80211.h

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ enum ath6kl_cfg_suspend_mode { 
	ATH6KL_CFG_SUSPEND_SCHED_SCAN,

};



struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,

struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, char *name,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type);

void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,

drivers/net/wireless/ath/ath6kl/core.c

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ EXPORT_SYMBOL(ath6kl_core_rx_complete); 
int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)

{

	struct ath6kl_bmi_target_info targ_info;

	struct net_device *ndev;

	struct wireless_dev *wdev;

	int ret = 0, i;



	switch (htc_type) {
@@ -187,12 +187,12 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) 
	rtnl_lock();



	/* Add an initial station interface */

	ndev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,

	wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,

				    INFRA_NETWORK);



	rtnl_unlock();



	if (!ndev) {

	if (!wdev) {

		ath6kl_err("Failed to instantiate a network device\n");

		ret = -ENOMEM;

		wiphy_unregister(ar->wiphy);
@@ -200,7 +200,7 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) 
	}



	ath6kl_dbg(ATH6KL_DBG_TRC, "%s: name=%s dev=0x%p, ar=0x%p\n",

		   __func__, ndev->name, ndev, ar);

		   __func__, wdev->netdev->name, wdev->netdev, ar);



	return ret;

drivers/net/wireless/mwifiex/cfg80211.c

+12 −12
Original line number Diff line number Diff line
@@ -1512,7 +1512,7 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info, 
/*

 *  create a new virtual interface with the given name

 */

struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,

struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,

					      char *name,

					      enum nl80211_iftype type,

					      u32 *flags,
@@ -1634,7 +1634,7 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy, 
#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);
@@ -1647,9 +1647,9 @@ EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf); 
/*

 * del_virtual_intf: remove the virtual interface determined by dev

 */

int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)

int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(wdev->netdev);



#ifdef CONFIG_DEBUG_FS

	mwifiex_dev_debugfs_remove(priv);
@@ -1661,11 +1661,11 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev) 
	if (netif_carrier_ok(priv->netdev))

		netif_carrier_off(priv->netdev);



	if (dev->reg_state == NETREG_REGISTERED)

		unregister_netdevice(dev);

	if (wdev->netdev->reg_state == NETREG_REGISTERED)

		unregister_netdevice(wdev->netdev);



	if (dev->reg_state == NETREG_UNREGISTERED)

		free_netdev(dev);

	if (wdev->netdev->reg_state == NETREG_UNREGISTERED)

		free_netdev(wdev->netdev);



	/* Clear the priv in adapter */

	priv->netdev = NULL;

drivers/net/wireless/mwifiex/main.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) 
	goto done;



err_add_intf:

	mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);

	mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev);

	rtnl_unlock();

err_init_fw:

	pr_debug("info: %s: unregister device\n", __func__);
@@ -844,7 +844,7 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem) 


		rtnl_lock();

		if (priv->wdev && priv->netdev)

			mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);

			mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev);

		rtnl_unlock();

	}