git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_vlan.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index
94b8ea8
..
4ca1755
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@
-32,7
+32,6
@@
* $Id: ipoib_vlan.c 1349 2004-12-16 21:09:43Z roland $
*/
* $Id: ipoib_vlan.c 1349 2004-12-16 21:09:43Z roland $
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-64,7
+63,7
@@
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
ppriv = netdev_priv(pdev);
ppriv = netdev_priv(pdev);
-
down
(&ppriv->vlan_mutex);
+
mutex_lock
(&ppriv->vlan_mutex);
/*
* First ensure this isn't a duplicate. We check the parent device and
/*
* First ensure this isn't a duplicate. We check the parent device and
@@
-114,8
+113,7
@@
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
priv->parent = ppriv->dev;
priv->parent = ppriv->dev;
- if (ipoib_create_debug_file(priv->dev))
- goto debug_failed;
+ ipoib_create_debug_files(priv->dev);
if (ipoib_add_pkey_attr(priv->dev))
goto sysfs_failed;
if (ipoib_add_pkey_attr(priv->dev))
goto sysfs_failed;
@@
-126,14
+124,12
@@
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
list_add_tail(&priv->list, &ppriv->child_intfs);
list_add_tail(&priv->list, &ppriv->child_intfs);
-
up
(&ppriv->vlan_mutex);
+
mutex_unlock
(&ppriv->vlan_mutex);
return 0;
sysfs_failed:
return 0;
sysfs_failed:
- ipoib_delete_debug_file(priv->dev);
-
-debug_failed:
+ ipoib_delete_debug_files(priv->dev);
unregister_netdev(priv->dev);
register_failed:
unregister_netdev(priv->dev);
register_failed:
@@
-143,7
+139,7
@@
device_init_failed:
free_netdev(priv->dev);
err:
free_netdev(priv->dev);
err:
-
up
(&ppriv->vlan_mutex);
+
mutex_unlock
(&ppriv->vlan_mutex);
return result;
}
return result;
}
@@
-157,7
+153,7
@@
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
ppriv = netdev_priv(pdev);
ppriv = netdev_priv(pdev);
-
down
(&ppriv->vlan_mutex);
+
mutex_lock
(&ppriv->vlan_mutex);
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
if (priv->pkey == pkey) {
unregister_netdev(priv->dev);
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
if (priv->pkey == pkey) {
unregister_netdev(priv->dev);
@@
-171,7
+167,7
@@
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
break;
}
}
break;
}
}
-
up
(&ppriv->vlan_mutex);
+
mutex_unlock
(&ppriv->vlan_mutex);
return ret;
}
return ret;
}