iwlwifi: remove 4965 prefix from iwl4965_frame (fcab423d) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-4965.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2016,7 +2016,7 @@ int iwl4965_hw_get_temperature(struct iwl_priv *priv)
	}		}

	unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,		unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
	struct iwl4965_frame *frame, u8 rate)		struct iwl_frame *frame, u8 rate)
	{		{
	struct iwl4965_tx_beacon_cmd *tx_beacon_cmd;		struct iwl4965_tx_beacon_cmd *tx_beacon_cmd;
	unsigned int frame_size;		unsigned int frame_size;

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -262,7 +262,7 @@ enum iwl_pwr_src {
	#define IEEE80211_HLEN (IEEE80211_4ADDR_LEN)		#define IEEE80211_HLEN (IEEE80211_4ADDR_LEN)
	#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)		#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)

	struct iwl4965_frame {		struct iwl_frame {
	union {		union {
	struct ieee80211_hdr frame;		struct ieee80211_hdr frame;
	struct iwl4965_tx_beacon_cmd beacon;		struct iwl4965_tx_beacon_cmd beacon;
	@@ -696,7 +696,7 @@ extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv priv, void tfd,
	dma_addr_t addr, u16 len);		dma_addr_t addr, u16 len);
	extern int iwl4965_hw_get_temperature(struct iwl_priv *priv);		extern int iwl4965_hw_get_temperature(struct iwl_priv *priv);
	extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,		extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
	struct iwl4965_frame *frame, u8 rate);		struct iwl_frame *frame, u8 rate);
	extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,		extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,
	struct iwl_cmd *cmd,		struct iwl_cmd *cmd,
	struct ieee80211_tx_control *ctrl,		struct ieee80211_tx_control *ctrl,

drivers/net/wireless/iwlwifi/iwl4965-base.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -800,7 +800,7 @@ static int iwl4965_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_fla
	return iwl_send_cmd(priv, &cmd);		return iwl_send_cmd(priv, &cmd);
	}		}

	static void iwl4965_clear_free_frames(struct iwl_priv *priv)		static void iwl_clear_free_frames(struct iwl_priv *priv)
	{		{
	struct list_head *element;		struct list_head *element;

	@@ -810,7 +810,7 @@ static void iwl4965_clear_free_frames(struct iwl_priv *priv)
	while (!list_empty(&priv->free_frames)) {		while (!list_empty(&priv->free_frames)) {
	element = priv->free_frames.next;		element = priv->free_frames.next;
	list_del(element);		list_del(element);
	kfree(list_entry(element, struct iwl4965_frame, list));		kfree(list_entry(element, struct iwl_frame, list));
	priv->frames_count--;		priv->frames_count--;
	}		}

	@@ -821,9 +821,9 @@ static void iwl4965_clear_free_frames(struct iwl_priv *priv)
	}		}
	}		}

	static struct iwl4965_frame iwl4965_get_free_frame(struct iwl_priv priv)		static struct iwl_frame iwl_get_free_frame(struct iwl_priv priv)
	{		{
	struct iwl4965_frame *frame;		struct iwl_frame *frame;
	struct list_head *element;		struct list_head *element;
	if (list_empty(&priv->free_frames)) {		if (list_empty(&priv->free_frames)) {
	frame = kzalloc(sizeof(*frame), GFP_KERNEL);		frame = kzalloc(sizeof(*frame), GFP_KERNEL);
	@@ -838,10 +838,10 @@ static struct iwl4965_frame iwl4965_get_free_frame(struct iwl_priv priv)

	element = priv->free_frames.next;		element = priv->free_frames.next;
	list_del(element);		list_del(element);
	return list_entry(element, struct iwl4965_frame, list);		return list_entry(element, struct iwl_frame, list);
	}		}

	static void iwl4965_free_frame(struct iwl_priv priv, struct iwl4965_frame frame)		static void iwl_free_frame(struct iwl_priv priv, struct iwl_frame frame)
	{		{
	memset(frame, 0, sizeof(*frame));		memset(frame, 0, sizeof(*frame));
	list_add(&frame->list, &priv->free_frames);		list_add(&frame->list, &priv->free_frames);
	@@ -892,12 +892,12 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv)

	static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)		static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
	{		{
	struct iwl4965_frame *frame;		struct iwl_frame *frame;
	unsigned int frame_size;		unsigned int frame_size;
	int rc;		int rc;
	u8 rate;		u8 rate;

	frame = iwl4965_get_free_frame(priv);		frame = iwl_get_free_frame(priv);

	if (!frame) {		if (!frame) {
	IWL_ERROR("Could not obtain free frame buffer for beacon "		IWL_ERROR("Could not obtain free frame buffer for beacon "
	@@ -912,7 +912,7 @@ static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
	rc = iwl_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,		rc = iwl_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
	&frame->u.cmd[0]);		&frame->u.cmd[0]);

	iwl4965_free_frame(priv, frame);		iwl_free_frame(priv, frame);

	return rc;		return rc;
	}		}
	@@ -4355,7 +4355,7 @@ static void __iwl4965_down(struct iwl_priv *priv)
	priv->ibss_beacon = NULL;		priv->ibss_beacon = NULL;

	/* clear out any free frames */		/* clear out any free frames */
	iwl4965_clear_free_frames(priv);		iwl_clear_free_frames(priv);
	}		}

	static void iwl4965_down(struct iwl_priv *priv)		static void iwl4965_down(struct iwl_priv *priv)

Admin message