Merge remote-tracking branch 'origin/master' into photon

This commit is contained in:
Gregory Nutt 2017-04-30 17:44:50 -06:00
commit 25e0f31637

View File

@ -2,7 +2,7 @@
* net/ieee80211/ieee80211_crypto.h
* 802.11 protocol crypto-related definitions.
*
* Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
* Copyright (c) 2007, 2008 Damien Bergamini <damien.bergamini@free.fr>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -18,8 +18,8 @@
*
****************************************************************************/
#ifndef __NET_IEEE80211_IEEE80211_CRYPTO_H
#define __NET_IEEE80211_IEEE80211_CRYPTO_H
#ifndef __INCLUDE_NUTTX_WIRELESS_IEEE80211_IEEE80211_CRYPTO_H
#define __INCLUDE_NUTTX_WIRELESS_IEEE80211_IEEE80211_CRYPTO_H
/****************************************************************************
* Included Files
@ -116,4 +116,4 @@ static __inline int ieee80211_is_sha256_akm(enum ieee80211_akm akm)
return akm == IEEE80211_AKM_SHA256_8021X || akm == IEEE80211_AKM_SHA256_PSK;
}
#endif /* __NET_IEEE80211_IEEE80211_CRYPTO_H */
#endif /* __INCLUDE_NUTTX_WIRELESS_IEEE80211_IEEE80211_CRYPTO_H */