diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-13 17:51:39 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-01-13 17:51:39 -0500 |
commit | 95ed644fd12f53c6fc778f3f246974e5fe3a9468 (patch) | |
tree | edf9f57192ad95f9165b3be5dbf1e8e745249ed1 /drivers/infiniband/ulp/ipoib/ipoib_main.c | |
parent | 9eacee2ac624bfa9740d49355dbe6ee88d0cba0a (diff) |
IB: convert from semaphores to mutexes
semaphore to mutex conversion by Ingo and Arjan's script.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
[ Sanity-checked on real IB hardware ]
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_main.c')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 780009c7eaa6..fd3f5c862a5d 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c | |||
@@ -105,7 +105,7 @@ int ipoib_open(struct net_device *dev) | |||
105 | struct ipoib_dev_priv *cpriv; | 105 | struct ipoib_dev_priv *cpriv; |
106 | 106 | ||
107 | /* Bring up any child interfaces too */ | 107 | /* Bring up any child interfaces too */ |
108 | down(&priv->vlan_mutex); | 108 | mutex_lock(&priv->vlan_mutex); |
109 | list_for_each_entry(cpriv, &priv->child_intfs, list) { | 109 | list_for_each_entry(cpriv, &priv->child_intfs, list) { |
110 | int flags; | 110 | int flags; |
111 | 111 | ||
@@ -115,7 +115,7 @@ int ipoib_open(struct net_device *dev) | |||
115 | 115 | ||
116 | dev_change_flags(cpriv->dev, flags | IFF_UP); | 116 | dev_change_flags(cpriv->dev, flags | IFF_UP); |
117 | } | 117 | } |
118 | up(&priv->vlan_mutex); | 118 | mutex_unlock(&priv->vlan_mutex); |
119 | } | 119 | } |
120 | 120 | ||
121 | netif_start_queue(dev); | 121 | netif_start_queue(dev); |
@@ -140,7 +140,7 @@ static int ipoib_stop(struct net_device *dev) | |||
140 | struct ipoib_dev_priv *cpriv; | 140 | struct ipoib_dev_priv *cpriv; |
141 | 141 | ||
142 | /* Bring down any child interfaces too */ | 142 | /* Bring down any child interfaces too */ |
143 | down(&priv->vlan_mutex); | 143 | mutex_lock(&priv->vlan_mutex); |
144 | list_for_each_entry(cpriv, &priv->child_intfs, list) { | 144 | list_for_each_entry(cpriv, &priv->child_intfs, list) { |
145 | int flags; | 145 | int flags; |
146 | 146 | ||
@@ -150,7 +150,7 @@ static int ipoib_stop(struct net_device *dev) | |||
150 | 150 | ||
151 | dev_change_flags(cpriv->dev, flags & ~IFF_UP); | 151 | dev_change_flags(cpriv->dev, flags & ~IFF_UP); |
152 | } | 152 | } |
153 | up(&priv->vlan_mutex); | 153 | mutex_unlock(&priv->vlan_mutex); |
154 | } | 154 | } |
155 | 155 | ||
156 | return 0; | 156 | return 0; |
@@ -892,8 +892,8 @@ static void ipoib_setup(struct net_device *dev) | |||
892 | spin_lock_init(&priv->lock); | 892 | spin_lock_init(&priv->lock); |
893 | spin_lock_init(&priv->tx_lock); | 893 | spin_lock_init(&priv->tx_lock); |
894 | 894 | ||
895 | init_MUTEX(&priv->mcast_mutex); | 895 | mutex_init(&priv->mcast_mutex); |
896 | init_MUTEX(&priv->vlan_mutex); | 896 | mutex_init(&priv->vlan_mutex); |
897 | 897 | ||
898 | INIT_LIST_HEAD(&priv->path_list); | 898 | INIT_LIST_HEAD(&priv->path_list); |
899 | INIT_LIST_HEAD(&priv->child_intfs); | 899 | INIT_LIST_HEAD(&priv->child_intfs); |