From: "M. Vefa Bicakci" <m.v.b@runbox.com>
To: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Cc: joe@perches.com, Larry.Finger@lwfinger.net,
gregkh@linuxfoundation.org, Jes.Sorensen@redhat.com,
m.v.b@runbox.com
Subject: [PATCH v2 01/16] staging: rtl8723au: Reformat whitespace to increase readability
Date: Sat, 14 Mar 2015 20:10:26 -0400 [thread overview]
Message-ID: <1426378241-32469-2-git-send-email-m.v.b@runbox.com> (raw)
In-Reply-To: <1426378241-32469-1-git-send-email-m.v.b@runbox.com>
Adjust the whitespace in the signature, local variable declaration and
initialization parts of a number of functions to increase readability
in rtl8723au's rtw_security.c.
v2: Make sure that the arcfour_encrypt function's argument list is split
according to the kernel code style.
Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
---
drivers/staging/rtl8723au/core/rtw_security.c | 79 +++++++++++++--------------
1 file changed, 38 insertions(+), 41 deletions(-)
diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index 0610d5f1bd..e68c8849ad 100644
--- a/drivers/staging/rtl8723au/core/rtw_security.c
+++ b/drivers/staging/rtl8723au/core/rtw_security.c
@@ -31,11 +31,11 @@ struct arc4context {
static void arcfour_init(struct arc4context *parc4ctx, u8 *key, u32 key_len)
{
- u32 t, u;
- u32 keyindex;
- u32 stateindex;
+ u32 t, u;
+ u32 keyindex;
+ u32 stateindex;
u8 *state;
- u32 counter;
+ u32 counter;
state = parc4ctx->state;
parc4ctx->x = 0;
@@ -55,7 +55,8 @@ static void arcfour_init(struct arc4context *parc4ctx, u8 *key, u32 key_len)
}
}
-static u32 arcfour_byte( struct arc4context *parc4ctx)
+
+static u32 arcfour_byte(struct arc4context *parc4ctx)
{
u32 x;
u32 y;
@@ -75,16 +76,13 @@ static u32 arcfour_byte( struct arc4context *parc4ctx)
return state[(sx + sy) & 0xff];
}
-static void arcfour_encrypt( struct arc4context *parc4ctx,
- u8 *dest,
- u8 *src,
- u32 len)
+static void arcfour_encrypt(struct arc4context *parc4ctx, u8 *dest,
+ u8 *src, u32 len)
{
- u32 i;
+ u32 i;
for (i = 0; i < len; i++)
dest[i] = src[i] ^ (unsigned char)arcfour_byte(parc4ctx);
-
}
static int bcrc32initialized = 0;
@@ -368,7 +366,7 @@ void rtw_seccalctkipmic23a(u8 *key, u8 *header, u8 *data, u32 data_len,
u8 *mic_code, u8 pri)
{
- struct mic_data micdata;
+ struct mic_data micdata;
u8 priority[4]={0x0, 0x0, 0x0, 0x0};
rtw_secmicsetkey23a(&micdata, key);
@@ -604,21 +602,21 @@ static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16)
int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
struct xmit_frame *pxmitframe)
{
- u16 pnl;
- u32 pnh;
- u8 rc4key[16];
- u8 ttkey[16];
- u8 crc[4];
- u8 hw_hdr_offset = 0;
+ u16 pnl;
+ u32 pnh;
+ u8 rc4key[16];
+ u8 ttkey[16];
+ u8 crc[4];
+ u8 hw_hdr_offset = 0;
struct arc4context mycontext;
- int curfragnum, length;
- u32 prwskeylen;
- u8 *pframe, *payload, *iv, *prwskey;
+ int curfragnum, length;
+ u32 prwskeylen;
+ u8 *pframe, *payload, *iv, *prwskey;
union pn48 dot11txpn;
- struct sta_info *stainfo;
- struct pkt_attrib *pattrib = &pxmitframe->attrib;
- struct security_priv *psecuritypriv = &padapter->securitypriv;
- struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
+ struct sta_info *stainfo;
+ struct pkt_attrib *pattrib = &pxmitframe->attrib;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
int res = _SUCCESS;
if (!pxmitframe->buf_addr)
@@ -706,17 +704,17 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
{
u16 pnl;
u32 pnh;
- u8 rc4key[16];
- u8 ttkey[16];
- u8 crc[4];
+ u8 rc4key[16];
+ u8 ttkey[16];
+ u8 crc[4];
struct arc4context mycontext;
- int length;
- u32 prwskeylen;
- u8 *pframe, *payload, *iv, *prwskey;
+ int length;
+ u32 prwskeylen;
+ u8 *pframe, *payload, *iv, *prwskey;
union pn48 dot11txpn;
- struct sta_info *stainfo;
- struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
- struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct sta_info *stainfo;
+ struct rx_pkt_attrib *prxattrib = &precvframe->attrib;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
struct sk_buff *skb = precvframe->pkt;
int res = _SUCCESS;
@@ -1128,8 +1126,8 @@ static void bitwise_xor(u8 *ina, u8 *inb, u8 *out)
static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
{
- uint qc_exists, a4_exists, i, j, payload_remainder,
- num_blocks, payload_index;
+ uint qc_exists, a4_exists, i, j, payload_remainder,
+ num_blocks, payload_index;
u8 pn_vector[6];
u8 mic_iv[16];
u8 mic_header1[16];
@@ -1345,12 +1343,11 @@ out:
return res;
}
-static int aes_decipher(u8 *key, uint hdrlen,
- u8 *pframe, uint plen)
+static int aes_decipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
{
- static u8 message[MAX_MSG_SIZE];
- uint qc_exists, a4_exists, i, j, payload_remainder,
- num_blocks, payload_index;
+ static u8 message[MAX_MSG_SIZE];
+ uint qc_exists, a4_exists, i, j, payload_remainder,
+ num_blocks, payload_index;
int res = _SUCCESS;
u8 pn_vector[6];
u8 mic_iv[16];
--
2.1.4
next prev parent reply other threads:[~2015-03-15 0:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-15 0:10 [PATCH v2 00/16] checkpatch clean-up of rtl8723au's rtw_security.c M. Vefa Bicakci
2015-03-15 0:10 ` M. Vefa Bicakci [this message]
2015-03-15 0:10 ` [PATCH v2 02/16] staging: rtl8723au: Fix "before/around/after" whitespace issues M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 03/16] staging: rtl8723au: else should follow close brace M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 04/16] staging: rtl8723au: Fix the indentation of two lines M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 05/16] staging: rtl8723au: Reorganize a few functions to remove indentation M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 06/16] staging: rtl8723au: Do not initialize a static to 0 M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 07/16] staging: rtl8723au: else is not generally useful after a return M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 08/16] staging: rtl8723au: Remove unneeded curly braces M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 09/16] staging: rtl8723au: trailing statements should be on next line M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 10/16] staging: rtl8723au: that open brace should be on the previous line M. Vefa Bicakci
2015-03-16 16:36 ` Jes Sorensen
2015-03-15 0:10 ` [PATCH v2 11/16] staging: rtl8723au: No spaces at the start of a line M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 12/16] staging: rtl8723au: Adjust whitespace in and around comments M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 13/16] staging: rtl8723au: suspect code indent for conditional statements M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 14/16] staging: rtl8723au: Rework two byte array comparisons M. Vefa Bicakci
2015-03-15 0:10 ` [PATCH v2 15/16] staging: rtl8723au: Correct a typo in a trace log line M. Vefa Bicakci
2015-03-16 16:38 ` Jes Sorensen
2015-03-15 0:10 ` [PATCH v2 16/16] staging: rtl8723au: Remove unneeded comments M. Vefa Bicakci
2015-03-15 9:31 ` [PATCH v2 00/16] checkpatch clean-up of rtl8723au's rtw_security.c Matthias Beyer
2015-03-15 13:51 ` M. Vefa Bicakci
2015-03-16 16:01 ` Jes Sorensen
2015-03-16 16:55 ` Joe Perches
2015-03-16 17:07 ` Greg KH
2015-03-16 17:11 ` Joe Perches
2015-03-19 4:34 ` M. Vefa Bicakci
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426378241-32469-2-git-send-email-m.v.b@runbox.com \
--to=m.v.b@runbox.com \
--cc=Jes.Sorensen@redhat.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).