Commit 26c080bf authored by Jay Schulist's avatar Jay Schulist Committed by Jeff Garzik

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: default avatarJay Schulist <jjschlst@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent df9dcb45
...@@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev, ...@@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev,
tsv->svi = TRANSMIT_STATUS_CODE; tsv->svi = TRANSMIT_STATUS_CODE;
tsv->svl = S_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 */ /* Stripped frame status of Transmitted Frame */
tsv->svv[1] = tx_fstatus & 0xff; tsv->svv[1] = tx_fstatus & 0xff;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment