cvs commit: src/contrib/hostapd FREEBSD-Xlist FREEBSD-upgrade eap.c eap.h eapol_sm.c hostapd_ctrl.c hostapd_ctrl.h ieee802_1x.c ieee802_1x.h wpa.c

[Sam Leffler]

sam         2006-03-07 05:51:53 UTC

  FreeBSD src repository

  Modified files:
    contrib/hostapd      FREEBSD-Xlist FREEBSD-upgrade eap.c eap.h 
                         eapol_sm.c ieee802_1x.c ieee802_1x.h 
                         wpa.c 
  Removed files:
    contrib/hostapd      hostapd_ctrl.c hostapd_ctrl.h 
  Log:
  resolve merge conflicts
  
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.2       +3 -1      src/contrib/hostapd/FREEBSD-Xlist
  1.2       +4 -4      src/contrib/hostapd/FREEBSD-upgrade
  1.3       +26 -1     src/contrib/hostapd/eap.c
  1.3       +4 -3      src/contrib/hostapd/eap.h
  1.4       +113 -45   src/contrib/hostapd/eapol_sm.c
  1.2       +0 -188    src/contrib/hostapd/hostapd_ctrl.c (dead)
  1.2       +0 -18     src/contrib/hostapd/hostapd_ctrl.h (dead)
  1.4       +162 -57   src/contrib/hostapd/ieee802_1x.c
  1.3       +10 -8     src/contrib/hostapd/ieee802_1x.h
  1.4       +96 -14    src/contrib/hostapd/wpa.c