diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-16 23:21:24 -0400 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/sky2.c | |
| parent | c86ae82605ef92594a0de809a8c588ae955fed63 (diff) | |
| parent | 7fefe6a88494b00b151b5ca7bb84daaa781bbca7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index daf961ab68bc..ba768dfa59e0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -1151,14 +1151,7 @@ stopped: | |||
| 1151 | 1151 | ||
| 1152 | /* reset the Rx prefetch unit */ | 1152 | /* reset the Rx prefetch unit */ |
| 1153 | sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET); | 1153 | sky2_write32(hw, Y2_QADDR(rxq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET); |
| 1154 | 1154 | mmiowb(); | |
| 1155 | /* Reset the RAM Buffer receive queue */ | ||
| 1156 | sky2_write8(hw, RB_ADDR(rxq, RB_CTRL), RB_RST_SET); | ||
| 1157 | |||
| 1158 | /* Reset Rx MAC FIFO */ | ||
| 1159 | sky2_write8(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), GMF_RST_SET); | ||
| 1160 | |||
| 1161 | sky2_read8(hw, B0_CTST); | ||
| 1162 | } | 1155 | } |
| 1163 | 1156 | ||
| 1164 | /* Clean out receive buffer area, assumes receiver hardware stopped */ | 1157 | /* Clean out receive buffer area, assumes receiver hardware stopped */ |