diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 14:00:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-18 14:00:39 +1000 |
| commit | bcac4334d44affdf22d25258fbc9f674d8be4816 (patch) | |
| tree | a1626da2ebbb106d6499e08af5413f6e8a0e992e /net | |
| parent | c352304a4ec213c30679645beef46b85d8474eb6 (diff) | |
| parent | 42cb0c7bdf9ddd33b33d195414f9171e7fa7472c (diff) | |
Merge remote-tracking branch 'crypto/master'
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/aes_ccm.c | 3 | ||||
| -rw-r--r-- | net/mac80211/aes_gcm.c | 3 | ||||
| -rw-r--r-- | net/mac80211/aes_gmac.c | 2 | ||||
| -rw-r--r-- | net/mac802154/llsec.c | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c index 208df7c0b6ea..70d53dab6508 100644 --- a/net/mac80211/aes_ccm.c +++ b/net/mac80211/aes_ccm.c @@ -11,9 +11,8 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/crypto.h> #include <linux/err.h> -#include <crypto/aes.h> +#include <crypto/aead.h> #include <net/mac80211.h> #include "key.h" diff --git a/net/mac80211/aes_gcm.c b/net/mac80211/aes_gcm.c index fd278bbe1b0d..b91c9d7bf665 100644 --- a/net/mac80211/aes_gcm.c +++ b/net/mac80211/aes_gcm.c @@ -8,9 +8,8 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/crypto.h> #include <linux/err.h> -#include <crypto/aes.h> +#include <crypto/aead.h> #include <net/mac80211.h> #include "key.h" diff --git a/net/mac80211/aes_gmac.c b/net/mac80211/aes_gmac.c index f1321b7d6506..c34b06caf539 100644 --- a/net/mac80211/aes_gmac.c +++ b/net/mac80211/aes_gmac.c @@ -9,8 +9,8 @@ #include <linux/kernel.h> #include <linux/types.h> -#include <linux/crypto.h> #include <linux/err.h> +#include <crypto/aead.h> #include <crypto/aes.h> #include <net/mac80211.h> diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index 5b2be12832e6..67edcacadbcb 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c @@ -17,8 +17,9 @@ #include <linux/err.h> #include <linux/bug.h> #include <linux/completion.h> +#include <linux/crypto.h> #include <linux/ieee802154.h> -#include <crypto/algapi.h> +#include <crypto/aead.h> #include "ieee802154_i.h" #include "llsec.h" |