diff options
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 9aa1a7b1b506..e84b1d755f07 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -1793,7 +1793,7 @@ struct crypto { struct crypto_hash *csums_tfm; struct crypto_hash *cram_hmac_tfm; struct crypto_hash *integrity_tfm; - struct crypto_hash *integrity_r_tfm; + struct crypto_hash *peer_integrity_tfm; void *int_dig_in; void *int_dig_vv; }; @@ -1835,7 +1835,7 @@ alloc_crypto(struct crypto *crypto, struct net_conf *new_conf) ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND); if (rv != NO_ERROR) return rv; - rv = alloc_tfm(&crypto->integrity_r_tfm, new_conf->integrity_alg, + rv = alloc_tfm(&crypto->peer_integrity_tfm, new_conf->integrity_alg, ERR_INTEGRITY_ALG, ERR_INTEGRITY_ALG_ND); if (rv != NO_ERROR) return rv; @@ -1865,7 +1865,7 @@ static void free_crypto(struct crypto *crypto) kfree(crypto->int_dig_vv); crypto_free_hash(crypto->cram_hmac_tfm); crypto_free_hash(crypto->integrity_tfm); - crypto_free_hash(crypto->integrity_r_tfm); + crypto_free_hash(crypto->peer_integrity_tfm); crypto_free_hash(crypto->csums_tfm); crypto_free_hash(crypto->verify_tfm); } @@ -1958,8 +1958,8 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info) tconn->int_dig_vv = crypto.int_dig_vv; crypto_free_hash(tconn->integrity_tfm); tconn->integrity_tfm = crypto.integrity_tfm; - crypto_free_hash(tconn->integrity_r_tfm); - tconn->integrity_r_tfm = crypto.integrity_r_tfm; + crypto_free_hash(tconn->peer_integrity_tfm); + tconn->peer_integrity_tfm = crypto.peer_integrity_tfm; /* FIXME Changing cram_hmac while the connection is established is useless */ crypto_free_hash(tconn->cram_hmac_tfm); @@ -2084,7 +2084,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) tconn->int_dig_vv = crypto.int_dig_vv; tconn->cram_hmac_tfm = crypto.cram_hmac_tfm; tconn->integrity_tfm = crypto.integrity_tfm; - tconn->integrity_r_tfm = crypto.integrity_r_tfm; + tconn->peer_integrity_tfm = crypto.peer_integrity_tfm; tconn->csums_tfm = crypto.csums_tfm; tconn->verify_tfm = crypto.verify_tfm; |