commit 26c080bf8308449330037f91daa3ac0a7c41023e
author Jay Schulist <jjschlst@gmail.com> Tue Mar 18 17:53:09 2008 -0400
committer Jeff Garzik <jeff@garzik.org> Tue Mar 25 23:15:32 2008 -0400
tree ad2b1d69580eae431d75dad104b3c1e7464a9e4e
parent df9dcb4588aca9cc243cf1f3f454361a84e1cbdb

smctr.c: fix logical-bitwise-or confusion

This patch to drivers/net/tokenring/smctr.c fixes a "bitwise vs
logical" or error.

Signed-off-by: Jay Schulist <jjschlst@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/net/tokenring/smctr.c

diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 8909050..5f1c507 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3413,7 +3413,7 @@
         tsv->svi = TRANSMIT_STATUS_CODE;
         tsv->svl = S_TRANSMIT_STATUS_CODE;
 
-        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) || IBM_PASS_SOURCE_ADDR);
+	tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR);
 
         /* Stripped frame status of Transmitted Frame */
         tsv->svv[1] = tx_fstatus & 0xff;