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

Commit 643aab67 authored by John W. Linville's avatar John W. Linville
Browse files

rtl8180: remove priv->mode 



It is only checked in add_interface, and there it is easily replaced
with a check of priv->vif.  If that information should become necessary,
it is available in vif->type anyway.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5122d898

drivers/net/wireless/rtl818x/rtl8180.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct rtl8180_priv { 
	struct rtl818x_csr __iomem *map;

	const struct rtl818x_rf_ops *rf;

	struct ieee80211_vif *vif;

	int mode;



	/* rtl8180 driver specific */

	spinlock_t lock;

drivers/net/wireless/rtl818x/rtl8180_dev.c

+5 −9
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ static const struct ieee80211_channel rtl818x_channels[] = { 
};









void rtl8180_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)

{

	struct rtl8180_priv *priv = dev->priv;
@@ -615,7 +613,6 @@ static int rtl8180_start(struct ieee80211_hw *dev) 
	reg |= RTL818X_CMD_TX_ENABLE;

	rtl818x_iowrite8(priv, &priv->map->CMD, reg);



	priv->mode = NL80211_IFTYPE_MONITOR;

	return 0;



 err_free_rings:
@@ -633,8 +630,6 @@ static void rtl8180_stop(struct ieee80211_hw *dev) 
	u8 reg;

	int i;



	priv->mode = NL80211_IFTYPE_UNSPECIFIED;



	rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0);



	reg = rtl818x_ioread8(priv, &priv->map->CMD);
@@ -661,12 +656,14 @@ static int rtl8180_add_interface(struct ieee80211_hw *dev, 
{

	struct rtl8180_priv *priv = dev->priv;



	if (priv->mode != NL80211_IFTYPE_MONITOR)

		return -EOPNOTSUPP;

	/*

	 * We only support one active interface at a time.

	 */

	if (priv->vif)

		return -EBUSY;



	switch (conf->type) {

	case NL80211_IFTYPE_STATION:

		priv->mode = conf->type;

		break;

	default:

		return -EOPNOTSUPP;
@@ -688,7 +685,6 @@ static void rtl8180_remove_interface(struct ieee80211_hw *dev, 
				     struct ieee80211_if_init_conf *conf)

{

	struct rtl8180_priv *priv = dev->priv;

	priv->mode = NL80211_IFTYPE_MONITOR;

	priv->vif = NULL;

}