[Madwifi-cvs] madwifi/net80211 ieee80211_output.c,1.8.2.1,1.8.2.2

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

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

Modified Files:
      Tag: BSD
	ieee80211_output.c 
Log Message:
- correct check for unicast key being setup; wpa_supplicant in particular
  uses only the global key state so looking in the per-node key slot is 
  wrong; when working as authenticator always check for unicast key setup
  in node


Index: ieee80211_output.c
===================================================================
RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_output.c,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** ieee80211_output.c	16 Feb 2005 14:15:15 -0000	1.8.2.1
--- ieee80211_output.c	16 Feb 2005 14:51:18 -0000	1.8.2.2
***************
*** 555,559 ****
  		if (eh.ether_type != __constant_htons(ETHERTYPE_PAE) ||
  		    ((ic->ic_flags & IEEE80211_F_WPA) &&
! 		     !KEY_UNDEFINED(ni->ni_ucastkey))) {
  			wh->i_fc[1] |= IEEE80211_FC1_WEP;
  			/* XXX do fragmentation */
--- 555,560 ----
  		if (eh.ether_type != __constant_htons(ETHERTYPE_PAE) ||
  		    ((ic->ic_flags & IEEE80211_F_WPA) &&
! 		    (ic->ic_opmode == IEEE80211_M_STA ?
! 		    !KEY_UNDEFINED(*key) : !KEY_UNDEFINED(ni->ni_ucastkey)))) {
  			wh->i_fc[1] |= IEEE80211_FC1_WEP;
  			/* XXX do fragmentation */