Commit 1b2bc0aa authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: struct vnt_private replace wSeqCounter with seq_counter 



Removing type prefix and camel case

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba06e38c

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ struct vnt_private { 
	u16 current_aid;



	/* Beacon releated */

	u16 wSeqCounter;

	u16 seq_counter;



	enum vnt_cmd_state command_state;

drivers/staging/vt6656/rxtx.c

+5 −5
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) 
				tx_key, skb, tx_body_size, mic_hdr);

	}



	priv->wSeqCounter = (le16_to_cpu(hdr->seq_ctrl) &

	priv->seq_counter = (le16_to_cpu(hdr->seq_ctrl) &

						IEEE80211_SCTL_SEQ) >> 4;



	tx_buffer->tx_byte_count = cpu_to_le16(tx_bytes);
@@ -1004,12 +1004,12 @@ static int vnt_beacon_xmit(struct vnt_private *priv, 
	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {

		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)mgmt_hdr;

		hdr->duration_id = 0;

		hdr->seq_ctrl = cpu_to_le16(priv->wSeqCounter << 4);

		hdr->seq_ctrl = cpu_to_le16(priv->seq_counter << 4);

	}



	priv->wSeqCounter++;

	if (priv->wSeqCounter > 0x0fff)

		priv->wSeqCounter = 0;

	priv->seq_counter++;

	if (priv->seq_counter > 0x0fff)

		priv->seq_counter = 0;



	count = sizeof(struct vnt_tx_short_buf_head) + skb->len;