diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-12 03:39:10 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-10-17 19:26:07 +0200 |
commit | 448c7f898227448130a66126870c5f1a718af3ae (patch) | |
tree | 0fc7881a41971300049c1dfcde09c34ca0cd5255 | |
parent | noise: no need to take the RCU lock if we're not dereferencing (diff) | |
download | wireguard-monolithic-historical-448c7f898227448130a66126870c5f1a718af3ae.tar.xz wireguard-monolithic-historical-448c7f898227448130a66126870c5f1a718af3ae.zip |
send: improve dead packet control flow
-rw-r--r-- | src/send.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -237,20 +237,17 @@ void packet_encrypt_worker(struct work_struct *work) bool have_simd = chacha20poly1305_init_simd(); while ((first = ptr_ring_consume_bh(&queue->ring)) != NULL) { - bool dead = false; + enum packet_state state = PACKET_STATE_CRYPTED; skb_walk_null_queue_safe (first, skb, next) { if (likely(skb_encrypt(skb, PACKET_CB(first)->keypair, have_simd))) skb_reset(skb); else { - queue_enqueue_per_peer(&PACKET_PEER(first)->tx_queue, first, PACKET_STATE_DEAD); - dead = true; + state = PACKET_STATE_DEAD; break; } } - if (unlikely(dead)) - continue; - queue_enqueue_per_peer(&PACKET_PEER(first)->tx_queue, first, PACKET_STATE_CRYPTED); + queue_enqueue_per_peer(&PACKET_PEER(first)->tx_queue, first, state); } chacha20poly1305_deinit_simd(have_simd); } |