diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-09-12 18:51:12 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-09-15 01:50:11 +0200 |
| commit | c2cb0a2013a338200b6aeda719bd01f1d89209e2 (patch) | |
| tree | da958ec8bd9083a455a467aeb8f287c80ff349db /src/timers.c | |
| parent | compat: add READ_ONCE/WRITE_ONCE for old kernels (diff) | |
| download | wireguard-monolithic-historical-c2cb0a2013a338200b6aeda719bd01f1d89209e2.tar.xz wireguard-monolithic-historical-c2cb0a2013a338200b6aeda719bd01f1d89209e2.zip | |
data: reorganize and edit new queuing code
This involves many changes of Samuel's new system, in addition
to some TODOs for things that are not yet ideal.
Diffstat (limited to 'src/timers.c')
| -rw-r--r-- | src/timers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/timers.c b/src/timers.c index b507aa3..07e9297 100644 --- a/src/timers.c +++ b/src/timers.c @@ -33,7 +33,7 @@ static void expired_retransmit_handshake(unsigned long ptr) del_timer(&peer->timer_send_keepalive); /* We drop all packets without a keypair and don't try again, * if we try unsuccessfully for too long to make a handshake. */ - peer_purge_queues(peer); + packet_purge_init_queue(peer); /* We set a timer for destroying any residue that might be left * of a partial exchange. */ if (likely(peer->timers_enabled) && !timer_pending(&peer->timer_zero_key_material)) @@ -75,7 +75,7 @@ static void expired_new_handshake(unsigned long ptr) static void expired_zero_key_material(unsigned long ptr) { peer_get_from_ptr(ptr); - if (!queue_work(peer->device->peer_wq, &peer->clear_peer_work)) /* Takes our reference. */ + if (!queue_work(peer->device->handshake_send_wq, &peer->clear_peer_work)) /* Takes our reference. */ peer_put(peer); /* If the work was already on the queue, we want to drop the extra reference */ } static void queued_expired_zero_key_material(struct work_struct *work) |