Removing prefix and camel case.
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 24 ++++++++++++------------
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 4fc93f0..7a7b6cbf 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -828,18 +828,18 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
/*Set fifo controls */
if (pkt_type == PK_TYPE_11A)
- tx_buffer_head->wFIFOCtl = 0;
+ tx_buffer_head->fifo_ctl = 0;
else if (pkt_type == PK_TYPE_11B)
- tx_buffer_head->wFIFOCtl = FIFOCTL_11B;
+ tx_buffer_head->fifo_ctl = FIFOCTL_11B;
else if (pkt_type == PK_TYPE_11GB)
- tx_buffer_head->wFIFOCtl = FIFOCTL_11GB;
+ tx_buffer_head->fifo_ctl = FIFOCTL_11GB;
else if (pkt_type == PK_TYPE_11GA)
- tx_buffer_head->wFIFOCtl = FIFOCTL_11GA;
+ tx_buffer_head->fifo_ctl = FIFOCTL_11GA;
if (!ieee80211_is_data(hdr->frame_control)) {
- tx_buffer_head->wFIFOCtl |= (FIFOCTL_GENINT |
+ tx_buffer_head->fifo_ctl |= (FIFOCTL_GENINT |
FIFOCTL_ISDMA0);
- tx_buffer_head->wFIFOCtl |= FIFOCTL_TMOEN;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_TMOEN;
tx_buffer_head->time_stamp =
cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
@@ -849,12 +849,12 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
}
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
- tx_buffer_head->wFIFOCtl |= FIFOCTL_NEEDACK;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_NEEDACK;
tx_context->need_ack = true;
}
if (ieee80211_has_retry(hdr->frame_control))
- tx_buffer_head->wFIFOCtl |= FIFOCTL_LRETRY;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_LRETRY;
if (tx_rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
priv->preamble_type = PREAMBLE_SHORT;
@@ -863,11 +863,11 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
if (tx_rate->flags & IEEE80211_TX_RC_USE_RTS_CTS) {
need_rts = true;
- tx_buffer_head->wFIFOCtl |= FIFOCTL_RTS;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_RTS;
}
if (ieee80211_has_a4(hdr->frame_control))
- tx_buffer_head->wFIFOCtl |= FIFOCTL_LHEAD;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_LHEAD;
if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
is_pspoll = true;
@@ -899,7 +899,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
/* legacy rates TODO use ieee80211_tx_rate */
if (current_rate >= RATE_18M && ieee80211_is_data(hdr->frame_control)) {
if (priv->auto_fb_ctrl == AUTO_FB_0) {
- tx_buffer_head->wFIFOCtl |= FIFOCTL_AUTO_FB_0;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_AUTO_FB_0;
priv->tx_rate_fb0 =
vnt_fb_opt0[FB_RATE0][current_rate - RATE_18M];
@@ -908,7 +908,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
fb_option = AUTO_FB_0;
} else if (priv->auto_fb_ctrl == AUTO_FB_1) {
- tx_buffer_head->wFIFOCtl |= FIFOCTL_AUTO_FB_1;
+ tx_buffer_head->fifo_ctl |= FIFOCTL_AUTO_FB_1;
priv->tx_rate_fb0 =
vnt_fb_opt1[FB_RATE0][current_rate - RATE_18M];
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 1cfa5ae..62a9ed3 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -222,7 +222,7 @@ union vnt_tx_head {
struct vnt_tx_fifo_head {
u8 tx_key[WLAN_KEY_LEN_CCMP];
- u16 wFIFOCtl;
+ u16 fifo_ctl;
__le16 time_stamp;
__le16 frag_ctl;
__le16 current_rate;
--
2.0.1
Endian is always little add correction in vnt_tx_packet.
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 26 ++++++++++++++------------
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 2dc7a17..64ec206 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -830,16 +830,16 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
if (pkt_type == PK_TYPE_11A)
tx_buffer_head->fifo_ctl = 0;
else if (pkt_type == PK_TYPE_11B)
- tx_buffer_head->fifo_ctl = FIFOCTL_11B;
+ tx_buffer_head->fifo_ctl = cpu_to_le16(FIFOCTL_11B);
else if (pkt_type == PK_TYPE_11GB)
- tx_buffer_head->fifo_ctl = FIFOCTL_11GB;
+ tx_buffer_head->fifo_ctl = cpu_to_le16(FIFOCTL_11GB);
else if (pkt_type == PK_TYPE_11GA)
- tx_buffer_head->fifo_ctl = FIFOCTL_11GA;
+ tx_buffer_head->fifo_ctl = cpu_to_le16(FIFOCTL_11GA);
if (!ieee80211_is_data(hdr->frame_control)) {
- tx_buffer_head->fifo_ctl |= (FIFOCTL_GENINT |
- FIFOCTL_ISDMA0);
- tx_buffer_head->fifo_ctl |= FIFOCTL_TMOEN;
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_GENINT |
+ FIFOCTL_ISDMA0);
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_TMOEN);
tx_buffer_head->time_stamp =
cpu_to_le16(DEFAULT_MGN_LIFETIME_RES_64us);
@@ -849,12 +849,12 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
}
if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {
- tx_buffer_head->fifo_ctl |= FIFOCTL_NEEDACK;
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_NEEDACK);
tx_context->need_ack = true;
}
if (ieee80211_has_retry(hdr->frame_control))
- tx_buffer_head->fifo_ctl |= FIFOCTL_LRETRY;
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_LRETRY);
if (tx_rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
priv->preamble_type = PREAMBLE_SHORT;
@@ -863,11 +863,11 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
if (tx_rate->flags & IEEE80211_TX_RC_USE_RTS_CTS) {
need_rts = true;
- tx_buffer_head->fifo_ctl |= FIFOCTL_RTS;
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_RTS);
}
if (ieee80211_has_a4(hdr->frame_control))
- tx_buffer_head->fifo_ctl |= FIFOCTL_LHEAD;
+ tx_buffer_head->fifo_ctl |= cpu_to_le16(FIFOCTL_LHEAD);
if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
is_pspoll = true;
@@ -899,7 +899,8 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
/* legacy rates TODO use ieee80211_tx_rate */
if (current_rate >= RATE_18M && ieee80211_is_data(hdr->frame_control)) {
if (priv->auto_fb_ctrl == AUTO_FB_0) {
- tx_buffer_head->fifo_ctl |= FIFOCTL_AUTO_FB_0;
+ tx_buffer_head->fifo_ctl |=
+ cpu_to_le16(FIFOCTL_AUTO_FB_0);
priv->tx_rate_fb0 =
vnt_fb_opt0[FB_RATE0][current_rate - RATE_18M];
@@ -908,7 +909,8 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
fb_option = AUTO_FB_0;
} else if (priv->auto_fb_ctrl == AUTO_FB_1) {
- tx_buffer_head->fifo_ctl |= FIFOCTL_AUTO_FB_1;
+ tx_buffer_head->fifo_ctl |=
+ cpu_to_le16(FIFOCTL_AUTO_FB_1);
priv->tx_rate_fb0 =
vnt_fb_opt1[FB_RATE0][current_rate - RATE_18M];
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index d5769c1..3f0ff7a 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -222,7 +222,7 @@ union vnt_tx_head {
struct vnt_tx_fifo_head {
u8 tx_key[WLAN_KEY_LEN_CCMP];
- u16 fifo_ctl;
+ __le16 fifo_ctl;
__le16 time_stamp;
__le16 frag_ctl;
__le16 current_rate;
--
2.0.1
Base type is always little endian.
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 2 +-
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 64ec206..2d1ef88 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -1013,7 +1013,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
vnt_time_stamp_off(priv, current_rate);
} else {
current_rate = RATE_1M;
- short_head->fifo_ctl |= FIFOCTL_11B;
+ short_head->fifo_ctl |= cpu_to_le16(FIFOCTL_11B);
/* Get SignalField,ServiceField,Length */
vnt_get_phy_field(priv, frame_size, current_rate,
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 3f0ff7a..90b34ab2 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -237,7 +237,7 @@ struct vnt_tx_buffer {
} __packed;
struct vnt_tx_short_buf_head {
- u16 fifo_ctl;
+ __le16 fifo_ctl;
u16 time_stamp;
struct vnt_phy_field ab;
__le16 duration;
--
2.0.1
Replacing camel case
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 2 +-
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 7a7b6cbf..7834128 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -949,7 +949,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
IEEE80211_SCTL_SEQ) >> 4;
tx_buffer->tx_byte_count = cpu_to_le16(tx_bytes);
- tx_buffer->byPKTNO = tx_context->pkt_no;
+ tx_buffer->pkt_no = tx_context->pkt_no;
tx_buffer->byType = 0x00;
tx_bytes += 4;
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 62a9ed3..dee2bdf 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -230,7 +230,7 @@ struct vnt_tx_fifo_head {
struct vnt_tx_buffer {
u8 byType;
- u8 byPKTNO;
+ u8 pkt_no;
__le16 tx_byte_count;
struct vnt_tx_fifo_head fifo_head;
union vnt_tx_head tx_head;
--
2.0.1
Removing camel case
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 2 +-
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 5a7114d..2dc7a17 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -1046,7 +1046,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
beacon_buffer->tx_byte_count = cpu_to_le16(count);
beacon_buffer->pkt_no = context->pkt_no;
- beacon_buffer->byType = 0x01;
+ beacon_buffer->type = 0x01;
context->type = CONTEXT_BEACON_PACKET;
context->buf_len = count + 4; /* USB header */
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 808058f..d5769c1 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -245,7 +245,7 @@ struct vnt_tx_short_buf_head {
} __packed;
struct vnt_beacon_buffer {
- u8 byType;
+ u8 type;
u8 pkt_no;
__le16 tx_byte_count;
struct vnt_tx_short_buf_head short_head;
--
2.0.1
removing camel case.
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 2 +-
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 7834128..8e33e40 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -1045,7 +1045,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
count = sizeof(struct vnt_tx_short_buf_head) + skb->len;
beacon_buffer->tx_byte_count = cpu_to_le16(count);
- beacon_buffer->byPKTNO = context->pkt_no;
+ beacon_buffer->pkt_no = context->pkt_no;
beacon_buffer->byType = 0x01;
context->type = CONTEXT_BEACON_PACKET;
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index dee2bdf..5439ed0 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -246,7 +246,7 @@ struct vnt_tx_short_buf_head {
struct vnt_beacon_buffer {
u8 byType;
- u8 byPKTNO;
+ u8 pkt_no;
__le16 tx_byte_count;
struct vnt_tx_short_buf_head short_head;
struct ieee80211_mgmt mgmt_hdr;
--
2.0.1
Removing camel case
Signed-off-by: Malcolm Priestley <[email protected]>
---
drivers/staging/vt6656/rxtx.c | 2 +-
drivers/staging/vt6656/rxtx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 8e33e40..5a7114d 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -950,7 +950,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
tx_buffer->tx_byte_count = cpu_to_le16(tx_bytes);
tx_buffer->pkt_no = tx_context->pkt_no;
- tx_buffer->byType = 0x00;
+ tx_buffer->type = 0x00;
tx_bytes += 4;
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 5439ed0..808058f 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -229,7 +229,7 @@ struct vnt_tx_fifo_head {
} __packed;
struct vnt_tx_buffer {
- u8 byType;
+ u8 type;
u8 pkt_no;
__le16 tx_byte_count;
struct vnt_tx_fifo_head fifo_head;
--
2.0.1