diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /drivers/net/e100.c | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 19d32a227be1..453115acaad2 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
| 1838 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1838 | if ((le16_to_cpu(rfd->command) & cb_el) && |
| 1839 | (RU_RUNNING == nic->ru_running)) | 1839 | (RU_RUNNING == nic->ru_running)) |
| 1840 | 1840 | ||
| 1841 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1841 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
| 1842 | nic->ru_running = RU_SUSPENDED; | 1842 | nic->ru_running = RU_SUSPENDED; |
| 1843 | return -ENODATA; | 1843 | return -ENODATA; |
| 1844 | } | 1844 | } |
| @@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
| 1861 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1861 | if ((le16_to_cpu(rfd->command) & cb_el) && |
| 1862 | (RU_RUNNING == nic->ru_running)) { | 1862 | (RU_RUNNING == nic->ru_running)) { |
| 1863 | 1863 | ||
| 1864 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1864 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
| 1865 | nic->ru_running = RU_SUSPENDED; | 1865 | nic->ru_running = RU_SUSPENDED; |
| 1866 | } | 1866 | } |
| 1867 | 1867 | ||