Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
aaeb6e24
Commit
aaeb6e24
authored
Jun 12, 2015
by
Jozsef Kadlecsik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
netfilter: ipset: Use MSEC_PER_SEC consistently
Signed-off-by:
Jozsef Kadlecsik
<
kadlec@blackhole.kfki.hu
>
parent
482cfc31
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
include/linux/netfilter/ipset/ip_set_timeout.h
include/linux/netfilter/ipset/ip_set_timeout.h
+2
-2
No files found.
include/linux/netfilter/ipset/ip_set_timeout.h
View file @
aaeb6e24
...
...
@@ -61,7 +61,7 @@ ip_set_timeout_set(unsigned long *timeout, u32 t)
return
;
}
*
timeout
=
msecs_to_jiffies
(
t
*
1000
)
+
jiffies
;
*
timeout
=
msecs_to_jiffies
(
t
*
MSEC_PER_SEC
)
+
jiffies
;
if
(
*
timeout
==
IPSET_ELEM_PERMANENT
)
/* Bingo! :-) */
(
*
timeout
)
--
;
...
...
@@ -71,7 +71,7 @@ static inline u32
ip_set_timeout_get
(
unsigned
long
*
timeout
)
{
return
*
timeout
==
IPSET_ELEM_PERMANENT
?
0
:
jiffies_to_msecs
(
*
timeout
-
jiffies
)
/
1000
;
jiffies_to_msecs
(
*
timeout
-
jiffies
)
/
MSEC_PER_SEC
;
}
#endif
/* __KERNEL__ */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment