git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ice/base: store NVM version in extracted format
[dpdk.git]
/
drivers
/
common
/
dpaax
/
caamflib
/
desc
/
ipsec.h
diff --git
a/drivers/common/dpaax/caamflib/desc/ipsec.h
b/drivers/common/dpaax/caamflib/desc/ipsec.h
index
f33c68c
..
cf6fa42
100644
(file)
--- a/
drivers/common/dpaax/caamflib/desc/ipsec.h
+++ b/
drivers/common/dpaax/caamflib/desc/ipsec.h
@@
-256,14
+256,14
@@
struct ipsec_encap_cbc {
/**
* struct ipsec_encap_ctr - PDB part for IPsec CTR encapsulation
/**
* struct ipsec_encap_ctr - PDB part for IPsec CTR encapsulation
- * @ctr_nonce: 4-byte
array
nonce
+ * @ctr_nonce: 4-byte nonce
* @ctr_initial: initial count constant
* @iv: initialization vector
*/
struct ipsec_encap_ctr {
* @ctr_initial: initial count constant
* @iv: initialization vector
*/
struct ipsec_encap_ctr {
- uint
8_t ctr_nonce[4]
;
+ uint
32_t ctr_nonce
;
uint32_t ctr_initial;
uint32_t ctr_initial;
- uint
64_t iv
;
+ uint
8_t iv[8]
;
};
/**
};
/**
@@
-346,10
+346,9
@@
__rta_copy_ipsec_encap_pdb(struct program *program,
break;
case OP_PCL_IPSEC_AES_CTR:
break;
case OP_PCL_IPSEC_AES_CTR:
- rta_copy_data(program, pdb->ctr.ctr_nonce,
- sizeof(pdb->ctr.ctr_nonce));
+ rta_copy_data(program, (uint8_t *)&pdb->ctr.ctr_nonce, 4);
__rta_out32(program, pdb->ctr.ctr_initial);
__rta_out32(program, pdb->ctr.ctr_initial);
-
__rta_out64(program, true, pdb->ctr.iv
);
+
rta_copy_data(program, pdb->ctr.iv, sizeof(pdb->ctr.iv)
);
break;
case OP_PCL_IPSEC_AES_CCM8:
break;
case OP_PCL_IPSEC_AES_CCM8:
@@
-386,11
+385,11
@@
struct ipsec_decap_cbc {
/**
* struct ipsec_decap_ctr - PDB part for IPsec CTR decapsulation
/**
* struct ipsec_decap_ctr - PDB part for IPsec CTR decapsulation
- * @ctr_nonce: 4-byte
array
nonce
+ * @ctr_nonce: 4-byte nonce
* @ctr_initial: initial count constant
*/
struct ipsec_decap_ctr {
* @ctr_initial: initial count constant
*/
struct ipsec_decap_ctr {
- uint
8_t ctr_nonce[4]
;
+ uint
32_t ctr_nonce
;
uint32_t ctr_initial;
};
uint32_t ctr_initial;
};
@@
-464,8
+463,7
@@
__rta_copy_ipsec_decap_pdb(struct program *program,
break;
case OP_PCL_IPSEC_AES_CTR:
break;
case OP_PCL_IPSEC_AES_CTR:
- rta_copy_data(program, pdb->ctr.ctr_nonce,
- sizeof(pdb->ctr.ctr_nonce));
+ rta_copy_data(program, (uint8_t *)&pdb->ctr.ctr_nonce, 4);
__rta_out32(program, pdb->ctr.ctr_initial);
break;
__rta_out32(program, pdb->ctr.ctr_initial);
break;