diff options
author | Yafang Shao <laoar.shao@gmail.com> | 2018-08-05 23:57:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-08-06 13:42:48 -0400 |
commit | 9dae34978d83df06fc59aff5cf0d88ce41b80643 (patch) | |
tree | 28a36c4d718423b7b95e610a801739326ca9ae17 /net/compat.c | |
parent | 429711aec282c4b5fe5bbd7b2f0bbbff4110ffb2 (diff) |
net: avoid unnecessary sock_flag() check when enable timestamp
The sock_flag() check is alreay inside sock_enable_timestamp(), so it is
unnecessary checking it in the caller.
void sock_enable_timestamp(struct sock *sk, int flag)
{
if (!sock_flag(sk, flag)) {
...
}
}
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/compat.c')
-rw-r--r-- | net/compat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/compat.c b/net/compat.c index 7242cce5631b..3b2105f6549d 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -466,8 +466,7 @@ int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp) | |||
466 | 466 | ||
467 | ctv = (struct compat_timeval __user *) userstamp; | 467 | ctv = (struct compat_timeval __user *) userstamp; |
468 | err = -ENOENT; | 468 | err = -ENOENT; |
469 | if (!sock_flag(sk, SOCK_TIMESTAMP)) | 469 | sock_enable_timestamp(sk, SOCK_TIMESTAMP); |
470 | sock_enable_timestamp(sk, SOCK_TIMESTAMP); | ||
471 | tv = ktime_to_timeval(sk->sk_stamp); | 470 | tv = ktime_to_timeval(sk->sk_stamp); |
472 | if (tv.tv_sec == -1) | 471 | if (tv.tv_sec == -1) |
473 | return err; | 472 | return err; |
@@ -494,8 +493,7 @@ int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *usersta | |||
494 | 493 | ||
495 | ctv = (struct compat_timespec __user *) userstamp; | 494 | ctv = (struct compat_timespec __user *) userstamp; |
496 | err = -ENOENT; | 495 | err = -ENOENT; |
497 | if (!sock_flag(sk, SOCK_TIMESTAMP)) | 496 | sock_enable_timestamp(sk, SOCK_TIMESTAMP); |
498 | sock_enable_timestamp(sk, SOCK_TIMESTAMP); | ||
499 | ts = ktime_to_timespec(sk->sk_stamp); | 497 | ts = ktime_to_timespec(sk->sk_stamp); |
500 | if (ts.tv_sec == -1) | 498 | if (ts.tv_sec == -1) |
501 | return err; | 499 | return err; |