Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353846
b: refs/heads/master
c: f83a7c3
h: refs/heads/master
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent f242961 commit 6836367
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 2d33309ef901156b0ad8e2185bec3c06d46976ef
refs/heads/master: f83a7c34d4e57a5afddd94adf39c26f2a09677e1
12 changes: 6 additions & 6 deletions trunk/drivers/staging/wlags49_h2/wl_enc.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)

switch (i % 3) {

case 0 :
case 0:

szDest[t] = ((k & 0xFC) >> 2) + CH_START ;
szDest[t+1] = ((k & 0x03) << 4) + CH_START ;
Expand All @@ -135,7 +135,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
break;


case 1 :
case 1:

szDest[t] += ((k & 0xF0) >> 4);
szDest[t+1] = ((k & 0x0F) << 2) + CH_START ;
Expand All @@ -144,7 +144,7 @@ int wl_wep_code(char *szCrypt, char *szDest, void *Data, int nLen)
break;


case 2 :
case 2:

szDest[t] += ((k & 0xC0) >> 6);
szDest[t+1] = (k & 0x3F) + CH_START ;
Expand Down Expand Up @@ -201,20 +201,20 @@ int wl_wep_decode(char *szCrypt, void *Dest, char *szData)

for (i = t = 0; i < nLen; i++, t++) {
switch (i % 3) {
case 0 :
case 0:

szDest[i] = (((szData[t] - CH_START) & 0x3f) << 2) +
(((szData[t+1] - CH_START) & 0x30) >> 4);
break;


case 1 :
case 1:
szDest[i] = (((szData[t] - CH_START) & 0x0f) << 4) +
(((szData[t+1] - CH_START) & 0x3c) >> 2);
break;


case 2 :
case 2:
szDest[i] = (((szData[t] - CH_START) & 0x03) << 6) +
((szData[t+1] - CH_START) & 0x3f);
t++;
Expand Down

0 comments on commit 6836367

Please sign in to comment.