From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 7 Oct 2009 00:59:42 +0000 (+0000)
Subject: x25: bit and/or confusion in x25_ioctl()?
X-Git-Tag: v3.12-rc1~12159^2~820
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06a96b33aea838b61a6eeccded781a305cf85a12;p=kernel%2Fkernel-generic.git

x25: bit and/or confusion in x25_ioctl()?

Looking at commit ebc3f64b864f it appears that this was intended
and not the original, equivalent to `if (facilities.reverse & ~0x81)'.

In x25_parse_facilities() that patch changed how facilities->reverse
was set. No other bits were set than 0x80 and/or 0x01.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index ebbfe6b..e19d811 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1363,7 +1363,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 			    facilities.throughput > 0xDD)
 				break;
 			if (facilities.reverse &&
-				(facilities.reverse | 0x81)!= 0x81)
+				(facilities.reverse & 0x81) != 0x81)
 				break;
 			x25->facilities = facilities;
 			rc = 0;