diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2022-04-04 18:30:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-06 13:45:26 +0100 |
| commit | f4b41f062c424209e3939a81e6da022e049a45f2 (patch) | |
| tree | cd8e8a16fb7cc256ad2a0f4136b169bce3d40e47 /net/packet | |
| parent | 0b5c21bbc01e92745ca1ca4f6fd87d878fa3ea5e (diff) | |
| download | linux-f4b41f062c424209e3939a81e6da022e049a45f2.tar.gz linux-f4b41f062c424209e3939a81e6da022e049a45f2.tar.bz2 linux-f4b41f062c424209e3939a81e6da022e049a45f2.zip | |
net: remove noblock parameter from skb_recv_datagram()
skb_recv_datagram() has two parameters 'flags' and 'noblock' that are
merged inside skb_recv_datagram() by 'flags | (noblock ? MSG_DONTWAIT : 0)'
As 'flags' may contain MSG_DONTWAIT as value most callers split the 'flags'
into 'flags' and 'noblock' with finally obsolete bit operations like this:
skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &rc);
And this is not even done consistently with the 'flags' parameter.
This patch removes the obsolete and costly splitting into two parameters
and only performs bit operations when really needed on the caller side.
One missing conversion thankfully reported by kernel test robot. I missed
to enable kunit tests to build the mctp code.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index c39c09899fd0..d3caaf4d4b3e 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3421,7 +3421,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, * but then it will block. */ - skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err); + skb = skb_recv_datagram(sk, flags, &err); /* * An error occurred so return it. Because skb_recv_datagram() |