From: Jacob Keller <jacob.e.keller@intel.com>
Date: Tue, 2 Apr 2013 20:55:40 +0000 (-0700)
Subject: net: fix smatch warnings inside datagram_poll
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~238
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8facd5fb73c6e960555e5913743dfbb6c3d984a5;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed