Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit db40980fcdb560d7992b0511df16cdd3f7e381f3

Authored by Eric Dumazet
Committed by David S. Miller
1 parent d61702f127
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net: poll() optimizations 

No need to test twice sk->sk_shutdown & RCV_SHUTDOWN

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 4 changed files with 8 additions and 12 deletions Side-by-side Diff

net/bluetooth/af_bluetooth.c
Diff comments   View file @ db40980
... ... @@ -297,13 +297,12 @@
297 297 mask |= POLLERR;
298 298  
299 299 if (sk->sk_shutdown & RCV_SHUTDOWN)
300   - mask |= POLLRDHUP;
  300 + mask |= POLLRDHUP | POLLIN | POLLRDNORM;
301 301  
302 302 if (sk->sk_shutdown == SHUTDOWN_MASK)
303 303 mask |= POLLHUP;
304 304  
305   - if (!skb_queue_empty(&sk->sk_receive_queue) ||
306   - (sk->sk_shutdown & RCV_SHUTDOWN))
  305 + if (!skb_queue_empty(&sk->sk_receive_queue))
307 306 mask |= POLLIN | POLLRDNORM;
308 307  
309 308 if (sk->sk_state == BT_CLOSED)
... ... @@ -746,13 +746,12 @@
746 746 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
747 747 mask |= POLLERR;
748 748 if (sk->sk_shutdown & RCV_SHUTDOWN)
749   - mask |= POLLRDHUP;
  749 + mask |= POLLRDHUP | POLLIN | POLLRDNORM;
750 750 if (sk->sk_shutdown == SHUTDOWN_MASK)
751 751 mask |= POLLHUP;
752 752  
753 753 /* readable? */
754   - if (!skb_queue_empty(&sk->sk_receive_queue) ||
755   - (sk->sk_shutdown & RCV_SHUTDOWN))
  754 + if (!skb_queue_empty(&sk->sk_receive_queue))
756 755 mask |= POLLIN | POLLRDNORM;
757 756  
758 757 /* Connection-based need to check for termination and startup */
... ... @@ -5707,13 +5707,12 @@
5707 5707 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
5708 5708 mask |= POLLERR;
5709 5709 if (sk->sk_shutdown & RCV_SHUTDOWN)
5710   - mask |= POLLRDHUP;
  5710 + mask |= POLLRDHUP | POLLIN | POLLRDNORM;
5711 5711 if (sk->sk_shutdown == SHUTDOWN_MASK)
5712 5712 mask |= POLLHUP;
5713 5713  
5714 5714 /* Is it readable? Reconsider this code with TCP-style support. */
5715   - if (!skb_queue_empty(&sk->sk_receive_queue) ||
5716   - (sk->sk_shutdown & RCV_SHUTDOWN))
  5715 + if (!skb_queue_empty(&sk->sk_receive_queue))
5717 5716 mask |= POLLIN | POLLRDNORM;
5718 5717  
5719 5718 /* The association is either gone or not ready. */
... ... @@ -2024,11 +2024,10 @@
2024 2024 if (sk->sk_shutdown == SHUTDOWN_MASK)
2025 2025 mask |= POLLHUP;
2026 2026 if (sk->sk_shutdown & RCV_SHUTDOWN)
2027   - mask |= POLLRDHUP;
  2027 + mask |= POLLRDHUP | POLLIN | POLLRDNORM;
2028 2028  
2029 2029 /* readable? */
2030   - if (!skb_queue_empty(&sk->sk_receive_queue) ||
2031   - (sk->sk_shutdown & RCV_SHUTDOWN))
  2030 + if (!skb_queue_empty(&sk->sk_receive_queue))
2032 2031 mask |= POLLIN | POLLRDNORM;
2033 2032  
2034 2033 /* Connection-based need to check for termination and startup */