Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325513
b: refs/heads/master
c: 5317660
h: refs/heads/master
i:
  325511: 8f5fd31
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Sep 26, 2012
1 parent 2f6bdc6 commit f1dd904
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c06df2334ce9a0072c94ffffcd8977fe726015f1
refs/heads/master: 53176607a470092ad62a2268860308f441e493cd
8 changes: 4 additions & 4 deletions trunk/drivers/staging/rtl8712/rtl871x_security.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct arc4context {
u8 state[256];
};

static void arcfour_init(struct arc4context *parc4ctx, u8 * key, u32 key_len)
static void arcfour_init(struct arc4context *parc4ctx, u8 *key, u32 key_len)
{
u32 t, u;
u32 keyindex;
Expand Down Expand Up @@ -288,7 +288,7 @@ static void secmicclear(struct mic_data *pmicdata)
pmicdata->M = 0;
}

void r8712_secmicsetkey(struct mic_data *pmicdata, u8 * key)
void r8712_secmicsetkey(struct mic_data *pmicdata, u8 *key)
{
/* Set the key */
pmicdata->K0 = secmicgetuint32(key);
Expand Down Expand Up @@ -320,7 +320,7 @@ static void secmicappendbyte(struct mic_data *pmicdata, u8 b)
}
}

void r8712_secmicappend(struct mic_data *pmicdata, u8 * src, u32 nbytes)
void r8712_secmicappend(struct mic_data *pmicdata, u8 *src, u32 nbytes)
{
/* This is simple */
while (nbytes > 0) {
Expand Down Expand Up @@ -1368,7 +1368,7 @@ u32 r8712_aes_decrypt(struct _adapter *padapter, u8 *precvframe)
precvframe)->u.hdr.attrib;
struct security_priv *psecuritypriv = &padapter->securitypriv;

pframe = (unsigned char *)((union recv_frame*)precvframe)->
pframe = (unsigned char *)((union recv_frame *)precvframe)->
u.hdr.rx_data;
/* 4 start to encrypt each fragment */
if ((prxattrib->encrypt == _AES_)) {
Expand Down

0 comments on commit f1dd904

Please sign in to comment.