diff options
| author | Scott Feldman <scofeldm@cisco.com> | 2009-12-23 13:27:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 21:03:39 -0800 |
| commit | b3d18d191bb805f3effdfc083c4ce79789470b46 (patch) | |
| tree | 034a2d4cfda07b9f843942bc33a3e43ea2572489 /drivers/net/enic/vnic_intr.h | |
| parent | fe45332ed289d91e57eca11bfd1ca75d6e420ab4 (diff) | |
| download | op-kernel-dev-b3d18d191bb805f3effdfc083c4ce79789470b46.zip op-kernel-dev-b3d18d191bb805f3effdfc083c4ce79789470b46.tar.gz | |
enic: Bug fix: use safe queue shutdown in dev->stop
Fix dev->stop shutdown bug where driver was stopping xmit queue and then
disabling intrs. Fix is to disable intrs first and then stop the xmit
queue, otherwise an interrupt could cause the queue to be rewoken. Also,
no need to explicitly do queue servicing because queues are cleaned and
reset back to initial state at end of dev->stop. Servicing queues also
had the side-effect of also rewakening the xmit queue, which is not what
we want.
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic/vnic_intr.h')
| -rw-r--r-- | drivers/net/enic/vnic_intr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/enic/vnic_intr.h index 9a53604..f79a722 100644 --- a/drivers/net/enic/vnic_intr.h +++ b/drivers/net/enic/vnic_intr.h @@ -61,6 +61,7 @@ static inline void vnic_intr_unmask(struct vnic_intr *intr) static inline void vnic_intr_mask(struct vnic_intr *intr) { iowrite32(1, &intr->ctrl->mask); + (void)ioread32(&intr->ctrl->mask); } static inline void vnic_intr_return_credits(struct vnic_intr *intr, |
