xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ieee80211: fix misannotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Al Viro
2007-12-29 05:01:07 -05:00
committed by David S. Miller
parent c414e84b22
commit d9e94d5647
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/ieee80211/ieee80211_crypt_tkip.c
View File

@@ -189,7 +189,7 @@ static inline u16 Mk16(u8 hi, u8 lo)
return lo | (((u16) hi) << 8);
}
static inline u16 Mk16_le(u16 * v)
static inline u16 Mk16_le(__le16 * v)
{
return le16_to_cpu(*v);
}
@@ -275,15 +275,15 @@ static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,
PPK[5] = TTAK[4] + IV16;
/* Step 2 - 96-bit bijective mixing using S-box */
PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) & TK[0]));
PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) & TK[2]));
PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) & TK[4]));
PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) & TK[6]));
PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) & TK[8]));
PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) & TK[10]));
PPK[0] += _S_(PPK[5] ^ Mk16_le((__le16 *) & TK[0]));
PPK[1] += _S_(PPK[0] ^ Mk16_le((__le16 *) & TK[2]));
PPK[2] += _S_(PPK[1] ^ Mk16_le((__le16 *) & TK[4]));
PPK[3] += _S_(PPK[2] ^ Mk16_le((__le16 *) & TK[6]));
PPK[4] += _S_(PPK[3] ^ Mk16_le((__le16 *) & TK[8]));
PPK[5] += _S_(PPK[4] ^ Mk16_le((__le16 *) & TK[10]));
PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) & TK[12]));
PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) & TK[14]));
PPK[0] += RotR1(PPK[5] ^ Mk16_le((__le16 *) & TK[12]));
PPK[1] += RotR1(PPK[0] ^ Mk16_le((__le16 *) & TK[14]));
PPK[2] += RotR1(PPK[1]);
PPK[3] += RotR1(PPK[2]);
PPK[4] += RotR1(PPK[3]);
@@ -294,7 +294,7 @@ static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,
WEPSeed[0] = Hi8(IV16);
WEPSeed[1] = (Hi8(IV16) | 0x20) & 0x7F;
WEPSeed[2] = Lo8(IV16);
WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) & TK[0])) >> 1);
WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((__le16 *) & TK[0])) >> 1);
#ifdef __BIG_ENDIAN
{