From: Jakub Kicinski Date: Mon, 3 Jun 2019 22:17:03 +0000 (-0700) Subject: net/tls: use version from prot X-Git-Tag: v5.3-rc1~140^2~339^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9cd81988cce195598e04fd8290fea873052bb7bd;p=linux.git net/tls: use version from prot ctx->prot holds the same information as per-direction contexts. Almost all code gets TLS version from this structure, convert the last two stragglers, this way we can improve the cache utilization by moving the per-direction data into cold cache lines. Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe Signed-off-by: David S. Miller --- diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index bb9d229832cc..8ffc8f95f55f 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -252,7 +252,7 @@ static int tls_push_record(struct sock *sk, skb_frag_address(frag), record->len - prot->prepend_size, record_type, - ctx->crypto_send.info.version); + prot->version); /* HW doesn't care about the data in the tag, because it fills it. */ dummy_tag_frag.page = skb_frag_page(frag); @@ -264,7 +264,7 @@ static int tls_push_record(struct sock *sk, list_add_tail(&record->list, &offload_ctx->records_list); spin_unlock_irq(&offload_ctx->lock); offload_ctx->open_record = NULL; - tls_advance_record_sn(sk, &ctx->tx, ctx->crypto_send.info.version); + tls_advance_record_sn(sk, &ctx->tx, prot->version); for (i = 0; i < record->num_frags; i++) { frag = &record->frags[i];