summaryrefslogtreecommitdiff
path: root/net/decnet/dn_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/decnet/dn_timer.c')
-rw-r--r--net/decnet/dn_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c
index d9c150cc59a9..1d330fd43dc7 100644
--- a/net/decnet/dn_timer.c
+++ b/net/decnet/dn_timer.c
@@ -23,6 +23,7 @@
#include <linux/spinlock.h>
#include <net/sock.h>
#include <linux/atomic.h>
+#include <linux/jiffies.h>
#include <net/flow.h>
#include <net/dn.h>
@@ -91,7 +92,7 @@ static void dn_slow_timer(unsigned long arg)
* since the last successful transmission.
*/
if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) {
- if ((jiffies - scp->stamp) >= scp->keepalive)
+ if (time_after_eq(jiffies, scp->stamp + scp->keepalive))
scp->keepalive_fxn(sk);
}
ption value='libreoffice-3-6-0'>libreoffice-3-6-0 Unnamed repository; edit this file to name it for gitweb.root
summaryrefslogtreecommitdiff
path: root/source
AgeCommit message (Expand)AuthorFilesLines
2019-02-21tdf#123500 double '~' character in translationcp-6.0-31cp-6.0-30cp-6.0-29-20200902cp-6.0-29-20200120cp-6.0-29-20191127cp-6.0-29-20191019cp-6.0-29-20190912cp-6.0-29-20190828cp-6.0-27cp-6.0-26cp-6.0-25co-6.0-39co-6.0-38co-6.0-37co-6.0-36co-6.0-35co-6.0-34co-6.0-33co-6.0-32co-6.0-29co-6.0-28co-6.0-27cd-6.0-29-3cd-6.0-29cd-6.0-27cd-6.0-26cd-6.0-25distro/collabora/cp-6.0Andras Timar1-1/+1
2019-01-28[cp] Revert rename of Master Slide Designcp-6.0-23co-6.0-24co-6.0-23Andras Timar1-2/+2
2018-10-18update translations for 6.0.7 rc2cp-6.0-21-PTFcp-6.0-20cp-6.0-19cp-6.0-18cp-6.0-17cp-6.0-15cp-6.0-14cp-6.0-13CODE-4-RC1pCODE-4-RC1Christian Lohmaier78-622/+802
2018-10-18update translations for 6.0.7 rc1Christian Lohmaier603-127110/+126819
2018-08-27[cp] Collabora support linkcp-6.0-9cp-6.0-7cp-6.0-12Andras Timar64-93/+93
2018-08-10update translations for 6.0.6 rc2Christian Lohmaier81-493/+486
2018-08-10update translations for 6.0.6 rc1Christian Lohmaier524-6659/+5452
2018-08-10update translations for 6.0.5Christian Lohmaier45-836/+843
2018-08-10update translations for 6.0.5 rc2Christian Lohmaier257-5834/+5874
2018-06-03update translations for 6.0.5 rc1cp-6.0-6cp-6.0-5cp-6.0-3Christian Lohmaier259-1375/+3131
2018-06-03add Frisian translationChristian Lohmaier150-0/+197881
2018-06-03update translations for 6.0.5 rc1Christian Lohmaier143-1606/+1591
2018-06-03update translations for 6.0.4 rc2Christian Lohmaier210-6169/+5258
2018-04-26update translations for 6.0.4 rc1cp-6.0-2Christian Lohmaier253-13913/+10226
2018-04-26update translations for 6.0.3 rc2Christian Lohmaier161-3231/+2567
2018-04-26update translations for 6.0.3 rc1Christian Lohmaier650-6566/+6373
2018-03-08followup of core 12a80d5 for Sloveniancp-6.0-branch-pointAndras Timar1-1/+1
2018-02-25Updated Slovenian translationAndras Timar4-14/+14
2018-02-22update translations for 6.0.2 rc1Christian Lohmaier718-129684/+137151
2018-02-17Updated Slovenian translationAndras Timar7-1384/+1439
2018-02-08update translations for 6.0Christian Lohmaier420-9661/+8359
2018-01-24update translations for 6.0.0 rc3Christian Lohmaier501-16700/+13747
2018-01-17update translations after another de-fuzzying roundChristian Lohmaier1494-26316/+1330
2018-01-15update translations after first de-fuzzying roundChristian Lohmaier3272-224093/+14153
2018-01-10update translations for 6.0 rc2Christian Lohmaier1152-83636/+67632
2018-01-03Updated Slovenian translationAndras Timar19-235/+251
2017-12-21Updated Slovenian translationsAndras Timar1-13/+13
2017-12-20Updated Slovenian translationAndras Timar11-294/+4091
2017-12-20update translations for 6.0 rc1Christian Lohmaier1875-117341/+604955
2017-12-20Updated Slovenian translationAndras Timar27-1142/+1623
2017-12-18update translations for 6.0/masterChristian Lohmaier4166-354536/+699155
2017-12-12resurrect some translated strings via compendiumChristian Lohmaier2588-156024/+311864
2017-12-12update translationsChristian Lohmaier367-14115/+13078
2017-12-08Updated Slovenian translationsAndras Timar15-1542/+2259
2017-12-07update translations for 6.0 beta2Christian Lohmaier1714-380738/+445109
2017-12-03Updated Slovenian translationAndras Timar18-2721/+2936
2017-11-24Updated Slovenian translationAndras Timar17-591/+825
2017-11-24another set of translation updates for 6.0 beta1libreoffice-6-0-branch-pointChristian Lohmaier814-24823/+28475
2017-11-24remove hu-Hung as it doesn't contain any translation in the first placeChristian Lohmaier140-216230/+0
2017-11-24update sr and sr-Latn to current templatesChristian Lohmaier300-186003/+179863
2017-11-22update translations for 6.0 beta1Christian Lohmaier