net: fix smatch warnings inside datagram_poll
authorJacob Keller <jacob.e.keller@intel.com>
Tue, 2 Apr 2013 20:55:40 +0000 (13:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Apr 2013 20:59:16 +0000 (16:59 -0400)
commit8facd5fb73c6e960555e5913743dfbb6c3d984a5
tree2d15a5e9bcf859b437171d17aa8996048bfee634
parentbe0e2f1f7d2fb6c49ea29a4f8274b36537c34dba
net: fix smatch warnings inside datagram_poll

Commit 7d4c04fc170087119727119074e72445f2bb192b ("net: add option to enable
error queue packets waking select") has an issue due to operator precedence
causing the bit-wise OR to bind to the sock_flags call instead of the result of
the terniary conditional. This fixes the *_poll functions to work properly. The
old code results in "mask |= POLLPRI" instead of what was intended, which is to
only include POLLPRI when the socket option is enabled.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bluetooth/af_bluetooth.c
net/core/datagram.c
net/iucv/af_iucv.c
net/nfc/llcp/sock.c
net/unix/af_unix.c