From 50423b1aaa21cee9980ec3b39eb3c0ceae4f6c79 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 26 Nov 2011 15:35:10 -0500 Subject: [PATCH] --- yaml --- r: 277967 b: refs/heads/master c: f47398409c140a48dd40faf75a18f7c93504a22e h: refs/heads/master i: 277965: e3c76516d4306b46ec8b542eca3171d6838064f2 277963: 1856fd35cf78f71dcea7c0c955b7ef11265b4c48 277959: bc6569e7cc6b605c690eecf70a9155ce6c1995b2 277951: 912bb3e6d9ef2fe15cb23712e9d113d99e8a8c95 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/airo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c3667d9a112e..4825f6d569fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51b7b1c34e195886e38ee93ff2a8a203745f897f +refs/heads/master: f47398409c140a48dd40faf75a18f7c93504a22e diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c index ac1176a4f465..1c008c61b95c 100644 --- a/trunk/drivers/net/wireless/airo.c +++ b/trunk/drivers/net/wireless/airo.c @@ -1418,7 +1418,7 @@ static int encapsulate(struct airo_info *ai ,etherHead *frame, MICBuffer *mic, i emmh32_update(&context->seed,frame->da,ETH_ALEN * 2); // DA,SA emmh32_update(&context->seed,(u8*)&mic->typelen,10); // Type/Length and Snap emmh32_update(&context->seed,(u8*)&mic->seq,sizeof(mic->seq)); //SEQ - emmh32_update(&context->seed,frame->da + ETH_ALEN * 2,payLen); //payload + emmh32_update(&context->seed,(u8*)(frame + 1),payLen); //payload emmh32_final(&context->seed, (u8*)&mic->mic); /* New Type/length ?????????? */ @@ -1506,7 +1506,7 @@ static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *eth, u16 emmh32_update(&context->seed, eth->da, ETH_ALEN*2); emmh32_update(&context->seed, (u8 *)&mic->typelen, sizeof(mic->typelen)+sizeof(mic->u.snap)); emmh32_update(&context->seed, (u8 *)&mic->seq,sizeof(mic->seq)); - emmh32_update(&context->seed, eth->da + ETH_ALEN*2,payLen); + emmh32_update(&context->seed, (u8 *)(eth + 1),payLen); //Calculate MIC emmh32_final(&context->seed, digest);