On Sat, 2008-06-21 at 07:51 -0400, Luis R. Rodriguez wrote: > Some drivers may want to to use the TKIP key offsets for TX and RX > MIC so lets move this out. > > Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> > --- > include/net/cfg80211.h | 5 +++++ > net/mac80211/key.h | 37 ++++++++++++------------------------- > 2 files changed, 17 insertions(+), 25 deletions(-) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index e007508..6cb8b02 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -12,6 +12,11 @@ > * Copyright 2006, 2007 Johannes Berg <johannes@xxxxxxxxxxxxxxxx> > */ > > +/* Starting offsets for each key for TKIP */ > +#define ALG_TKIP_TEMP_ENCR_KEY 0 > +#define ALG_TKIP_TEMP_AUTH_TX_MIC_KEY 16 > +#define ALG_TKIP_TEMP_AUTH_RX_MIC_KEY 24 put it into nl80211 and give it proper namespace prefixes, please. > -/* ALG_TKIP > - * struct ieee80211_key::key is encoded as a 256-bit (32 byte) data block: > - * Temporal Encryption Key (128 bits) > - * Temporal Authenticator Tx MIC Key (64 bits) > - * Temporal Authenticator Rx MIC Key (64 bits) > - */ and why remove the comment? There's a small comment in nl80211.h but it could be described in more detail. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part