git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-27 03:49:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
590,547 Commits 6 Branches 316 Tags
c0cc53162a0644dd57dce5e2fbb9bbafdc57d183
Commit Graph

4 Commits

Author SHA1 Message Date
David S. Miller
c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
 2016-04-27 15:43:10 -04:00
Nicolas Dichtel
f60d94c009 macsec: use nla_put_u64_64bit() 
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2016-04-26 12:00:47 -04:00
Sabrina Dubroca
748164802c macsec: add missing macsec prefix in uapi 
I accidentally forgot some MACSEC_ prefixes in if_macsec.h.

Fixes: dece8d2b78 ("uapi: add MACsec bits")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2016-04-24 14:31:59 -04:00
Sabrina Dubroca
dece8d2b78 uapi: add MACsec bits 
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
 2016-03-13 22:40:24 -04:00