diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-27 21:48:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-27 21:48:56 -0400 |
| commit | 8e8e43843ba3ced0c657cbc0fdb10644ec60f772 (patch) | |
| tree | e64954326ced9c365c52c256f01b5f9fb1bcae66 /drivers/net/tokenring/smctr.c | |
| parent | ed85f2c3b2b72bd20f617ac749f5c22be8d0f66e (diff) | |
| parent | 50fd4407b8bfbde7c1a0bfe4f24de7df37164342 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
| -rw-r--r-- | drivers/net/tokenring/smctr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 8909050b8ea7..5f1c5072b96f 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev, | |||
| 3413 | tsv->svi = TRANSMIT_STATUS_CODE; | 3413 | tsv->svi = TRANSMIT_STATUS_CODE; |
| 3414 | tsv->svl = S_TRANSMIT_STATUS_CODE; | 3414 | tsv->svl = S_TRANSMIT_STATUS_CODE; |
| 3415 | 3415 | ||
| 3416 | tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) || IBM_PASS_SOURCE_ADDR); | 3416 | tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR); |
| 3417 | 3417 | ||
| 3418 | /* Stripped frame status of Transmitted Frame */ | 3418 | /* Stripped frame status of Transmitted Frame */ |
| 3419 | tsv->svv[1] = tx_fstatus & 0xff; | 3419 | tsv->svv[1] = tx_fstatus & 0xff; |