diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-05-03 14:07:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-03 14:07:43 -0700 |
| commit | d252a5e7b73026b3ba3c49940724292099e634f0 (patch) | |
| tree | c151797f0daecf457ef7a4bad027ecfdd8d79ad6 /drivers/net/cxgb3 | |
| parent | 3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card (diff) | |
| parent | virtio_net: Fix function name typo (diff) | |
| download | linux-dev-d252a5e7b73026b3ba3c49940724292099e634f0.tar.xz linux-dev-d252a5e7b73026b3ba3c49940724292099e634f0.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 1dd1637663a3..c8a865a7e26c 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c @@ -3784,7 +3784,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai, adapter->params.info = ai; adapter->params.nports = ai->nports0 + ai->nports1; - adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1); + adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1); adapter->params.rev = t3_read_reg(adapter, A_PL_REV); /* * We used to only run the "adapter check task" once a second if |