diff options
| author | Maciej Sosnowski <maciej.sosnowski@intel.com> | 2011-02-03 18:55:26 -0500 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-02-03 18:55:26 -0500 |
| commit | 25a54a6bb87dc966f6a3fc1f2ac6e88db1f5614c (patch) | |
| tree | 5ac11304c2b46557439fd22d688e2d93bd70fce3 | |
| parent | 831d52bc153971b70e64eccfbed2b232394f22f8 (diff) | |
RDMA/nes: Don't generate async events for unregistered devices
nes_port_ibevent() should not be called when the nes RDMA device is not
registered with the RDMA core. Add missing checks of of_device_registered flag.
Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 8b606fd64022..08c194861af5 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
| @@ -2610,9 +2610,11 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number) | |||
| 2610 | netif_carrier_on(nesvnic->netdev); | 2610 | netif_carrier_on(nesvnic->netdev); |
| 2611 | 2611 | ||
| 2612 | spin_lock(&nesvnic->port_ibevent_lock); | 2612 | spin_lock(&nesvnic->port_ibevent_lock); |
| 2613 | if (nesdev->iw_status == 0) { | 2613 | if (nesvnic->of_device_registered) { |
| 2614 | nesdev->iw_status = 1; | 2614 | if (nesdev->iw_status == 0) { |
| 2615 | nes_port_ibevent(nesvnic); | 2615 | nesdev->iw_status = 1; |
| 2616 | nes_port_ibevent(nesvnic); | ||
| 2617 | } | ||
| 2616 | } | 2618 | } |
| 2617 | spin_unlock(&nesvnic->port_ibevent_lock); | 2619 | spin_unlock(&nesvnic->port_ibevent_lock); |
| 2618 | } | 2620 | } |
| @@ -2642,9 +2644,11 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number) | |||
| 2642 | netif_carrier_off(nesvnic->netdev); | 2644 | netif_carrier_off(nesvnic->netdev); |
| 2643 | 2645 | ||
| 2644 | spin_lock(&nesvnic->port_ibevent_lock); | 2646 | spin_lock(&nesvnic->port_ibevent_lock); |
| 2645 | if (nesdev->iw_status == 1) { | 2647 | if (nesvnic->of_device_registered) { |
| 2646 | nesdev->iw_status = 0; | 2648 | if (nesdev->iw_status == 1) { |
| 2647 | nes_port_ibevent(nesvnic); | 2649 | nesdev->iw_status = 0; |
| 2650 | nes_port_ibevent(nesvnic); | ||
| 2651 | } | ||
| 2648 | } | 2652 | } |
| 2649 | spin_unlock(&nesvnic->port_ibevent_lock); | 2653 | spin_unlock(&nesvnic->port_ibevent_lock); |
| 2650 | } | 2654 | } |
| @@ -2703,9 +2707,11 @@ void nes_recheck_link_status(struct work_struct *work) | |||
| 2703 | netif_carrier_on(nesvnic->netdev); | 2707 | netif_carrier_on(nesvnic->netdev); |
| 2704 | 2708 | ||
| 2705 | spin_lock(&nesvnic->port_ibevent_lock); | 2709 | spin_lock(&nesvnic->port_ibevent_lock); |
| 2706 | if (nesdev->iw_status == 0) { | 2710 | if (nesvnic->of_device_registered) { |
| 2707 | nesdev->iw_status = 1; | 2711 | if (nesdev->iw_status == 0) { |
| 2708 | nes_port_ibevent(nesvnic); | 2712 | nesdev->iw_status = 1; |
| 2713 | nes_port_ibevent(nesvnic); | ||
| 2714 | } | ||
| 2709 | } | 2715 | } |
| 2710 | spin_unlock(&nesvnic->port_ibevent_lock); | 2716 | spin_unlock(&nesvnic->port_ibevent_lock); |
| 2711 | } | 2717 | } |
| @@ -2723,9 +2729,11 @@ void nes_recheck_link_status(struct work_struct *work) | |||
| 2723 | netif_carrier_off(nesvnic->netdev); | 2729 | netif_carrier_off(nesvnic->netdev); |
| 2724 | 2730 | ||
| 2725 | spin_lock(&nesvnic->port_ibevent_lock); | 2731 | spin_lock(&nesvnic->port_ibevent_lock); |
| 2726 | if (nesdev->iw_status == 1) { | 2732 | if (nesvnic->of_device_registered) { |
| 2727 | nesdev->iw_status = 0; | 2733 | if (nesdev->iw_status == 1) { |
| 2728 | nes_port_ibevent(nesvnic); | 2734 | nesdev->iw_status = 0; |
| 2735 | nes_port_ibevent(nesvnic); | ||
| 2736 | } | ||
| 2729 | } | 2737 | } |
| 2730 | spin_unlock(&nesvnic->port_ibevent_lock); | 2738 | spin_unlock(&nesvnic->port_ibevent_lock); |
| 2731 | } | 2739 | } |