smctr.c: fix logical-bitwise-or confusion
authorJay Schulist <jjschlst@gmail.com>
Tue, 18 Mar 2008 21:53:09 +0000 (17:53 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 26 Mar 2008 03:15:32 +0000 (23:15 -0400)
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

index 8909050b8ea7e57cda3efce74c181082bf09d3d9..5f1c5072b96f093ee8fa2161eaaf4ba04b6693e1 100644 (file)
@@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev,
         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;