summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKarsten Graul <kgraul@linux.ibm.com>2018-09-18 15:46:37 +0200
committerDavid S. Miller <davem@davemloft.net>2018-09-18 20:11:43 -0700
commit71d117f527425e2d6a5029e8365d82a8d2d6916a (patch)
tree7cf9ba3080ffdb97c48f0edb2c826c09e9f2d751 /net
parentdd65d87a6abd537ae9bb3bdcee8905704b936884 (diff)
downloadlinux-stable-71d117f527425e2d6a5029e8365d82a8d2d6916a.tar.gz
linux-stable-71d117f527425e2d6a5029e8365d82a8d2d6916a.tar.bz2
linux-stable-71d117f527425e2d6a5029e8365d82a8d2d6916a.zip
net/smc: no urgent data check for listen sockets
Don't check a listen socket for pending urgent data in smc_poll(). Signed-off-by: Karsten Graul <kgraul@linux.ibm.com> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/smc/af_smc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 5c6d30eb4a71..015231789ed2 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1566,9 +1566,9 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
if (sk->sk_state == SMC_APPCLOSEWAIT1)
mask |= EPOLLIN;
+ if (smc->conn.urg_state == SMC_URG_VALID)
+ mask |= EPOLLPRI;
}
- if (smc->conn.urg_state == SMC_URG_VALID)
- mask |= EPOLLPRI;
}
return mask;