From f173c7b3476bf434e0ff173d0b445718bc0111ae Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 12 Jan 2010 11:50:09 +1100 Subject: [PATCH] --- yaml --- r: 186638 b: refs/heads/master c: 0daa04a586f03de8f9022e29fb41c9dc0de28c4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/otus/80211core/ctkip.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9eaa04be539e..b40ceb234633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36e8c0add960eb523a8a1bc93c7efa744339415 +refs/heads/master: 0daa04a586f03de8f9022e29fb41c9dc0de28c4a diff --git a/trunk/drivers/staging/otus/80211core/ctkip.c b/trunk/drivers/staging/otus/80211core/ctkip.c index be42f7aaa37d..ca0740227be4 100644 --- a/trunk/drivers/staging/otus/80211core/ctkip.c +++ b/trunk/drivers/staging/otus/80211core/ctkip.c @@ -255,7 +255,8 @@ void zfTkipInit(u8_t* key, u8_t* ta, struct zsTkipSeed* pSeed, u8_t* initIv) zfMemoryCopy(pSeed->ta, ta, 6); zfMemoryCopy(pSeed->tk, key, 16); - iv16 = *initIv++; + iv16 = *initIv; + initIv++; iv16 += *initIv<<8; initIv++; @@ -264,7 +265,7 @@ void zfTkipInit(u8_t* key, u8_t* ta, struct zsTkipSeed* pSeed, u8_t* initIv) for(i=0; i<4; i++) // initiv is little endian { iv32 += *initIv<<(i*8); - *initIv++; + initIv++; } pSeed->iv32 = iv32+1; // Force Recalculating on Tkip Phase1