replace logical- by bit-or in smctr_make_tx_status_code(), drivers/net/tokenring/smctr.c

PATCH New Roel Kluin 1 participant 1 message Jan 28, 2008

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Roel Kluin

author

2008-01-28 10:54 UTC #0 lore raw

PATCH 1/1 replace logical- by bit-or in smctr_make_tx_status_code(), drivers/net/tokenring/smctr.c

drivers/net/tokenring/smctr.h:50:#define IBM_PASS_SOURCE_ADDR 0x01
--
replace logical- by bit-or for IBM_PASS_SOURCE_ADDR

Signed-off-by Roel Kluin <[email protected]>

---

drivers/net/tokenring/smctr.c +1 -1

index 93da3a3..ec29766 100644
@@ -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;