[Madwifi-cvs] madwifi/net80211 ieee80211_crypto_ccmp.c,1.3.2.1,1.3.2.2

[Sebastian W. <to...@us...>]

Update of /cvsroot/madwifi/madwifi/net80211
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29986/net80211

Modified Files:
      Tag: BSD
	ieee80211_crypto_ccmp.c 
Log Message:
- use ieee80211_hdrspace macro to calculate correct header length


Index: ieee80211_crypto_ccmp.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_crypto_ccmp.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** ieee80211_crypto_ccmp.c	16 Feb 2005 14:15:14 -0000	1.3.2.1
--- ieee80211_crypto_ccmp.c	17 Apr 2005 00:28:44 -0000	1.3.2.2
***************
*** 147,154 ****
  ccmp_encap(struct ieee80211_key *k, struct sk_buff *skb, u_int8_t keyid)
  {
  	u_int8_t *ivp;
  	int hdrlen;
  
! 	hdrlen = ieee80211_hdrsize(skb->data);
  
  	/*
--- 147,156 ----
  ccmp_encap(struct ieee80211_key *k, struct sk_buff *skb, u_int8_t keyid)
  {
+ 	struct ccmp_ctx *ctx = k->wk_private;
+ 	struct ieee80211com *ic = ctx->cc_ic;
  	u_int8_t *ivp;
  	int hdrlen;
  
! 	hdrlen = ieee80211_hdrspace(ic, skb->data);
  
  	/*