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

Commit 5e7d7eb9 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: remove iwl_ht_params.smps_mode 



This struct member is never set, so remove it.

Since this is the last thing that needs mac80211.h, also change
the includes to no longer use mac80211.h

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ad17b1d9

drivers/net/wireless/intel/iwlwifi/dvm/rxon.c

+0 −5
Original line number Diff line number Diff line
@@ -523,11 +523,6 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv, 
		return ret;

	}



	if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&

	    priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)

		ieee80211_request_smps(ctx->vif,

				       priv->cfg->ht_params->smps_mode);



	return 0;

}

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+3 −3
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ 
#define __IWL_CONFIG_H__



#include <linux/types.h>

#include <net/mac80211.h>



#include <linux/netdevice.h>

#include <linux/ieee80211.h>

#include <linux/nl80211.h>



enum iwl_device_family {

	IWL_DEVICE_FAMILY_UNDEFINED,
@@ -192,7 +193,6 @@ struct iwl_base_params { 
 * @ht40_bands: bitmap of bands (using %NL80211_BAND_*) that support HT40

 */

struct iwl_ht_params {

	enum ieee80211_smps_mode smps_mode;

	u8 ht_greenfield_support:1,

	   stbc:1,

	   ldpc:1,