diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-25 10:01:09 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-25 10:01:09 -0700 |
| commit | 536b5603e7a3c75c7d2e0c1c56980690909b12d3 (patch) | |
| tree | c48d8fe596cf3e6a3392d9688c27cd695d90a23a /net | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| parent | b4fe8ba7a310da6a2b99e3abe67c7815198cde49 (diff) | |
Merge tag 'ib-mfd-regmap-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regmap-irq-hdr
Immutable branch between MFD and Regmap due for v4.3
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 525f454f7531..b9b0e3b5da49 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1353,11 +1353,12 @@ static void prepare_write_keepalive(struct ceph_connection *con) dout("prepare_write_keepalive %p\n", con); con_out_kvec_reset(con); if (con->peer_features & CEPH_FEATURE_MSGR_KEEPALIVE2) { - struct timespec ts = CURRENT_TIME; - struct ceph_timespec ceph_ts; - ceph_encode_timespec(&ceph_ts, &ts); + struct timespec now = CURRENT_TIME; + con_out_kvec_add(con, sizeof(tag_keepalive2), &tag_keepalive2); - con_out_kvec_add(con, sizeof(ceph_ts), &ceph_ts); + ceph_encode_timespec(&con->out_temp_keepalive2, &now); + con_out_kvec_add(con, sizeof(con->out_temp_keepalive2), + &con->out_temp_keepalive2); } else { con_out_kvec_add(con, sizeof(tag_keepalive), &tag_keepalive); } |