diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-20 15:33:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 12:16:29 -0700 |
| commit | 1b2bc0aa8df1fcdb0dd52f7ea54c0029e8cc0f70 (patch) | |
| tree | d5747870b6961fcb6897b1992364d81a95566fa2 /drivers/staging | |
| parent | ba06e38c24b655a9f0f2d92c7ec1c2a9101216f4 (diff) | |
staging: vt6656: struct vnt_private replace wSeqCounter with seq_counter
Removing type prefix and camel case
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 905e90b3bc87..6647b2bff7da 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -364,7 +364,7 @@ struct vnt_private { u16 current_aid; /* Beacon releated */ - u16 wSeqCounter; + u16 seq_counter; enum vnt_cmd_state command_state; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 0e4b77339fd8..8d745afbdedd 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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; |