cvs commit: src/contrib/hostapd eapol_version.patch ieee802_1x.c wpa.c

[Sam Leffler]

sam         2008-03-24 21:08:25 UTC

  FreeBSD src repository

  Modified files:
    contrib/hostapd      ieee802_1x.c wpa.c 
  Removed files:
    contrib/hostapd      eapol_version.patch 
  Log:
  resolve merge conflicts
  
  MFC after:      3 weeks
  
  Revision  Changes    Path
  1.2       +0 -129    src/contrib/hostapd/eapol_version.patch (dead)
  1.6       +2 -0      src/contrib/hostapd/ieee802_1x.c
  1.6       +16 -29    src/contrib/hostapd/wpa.c