projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Improve formatting of bogus empty action attributes.
[openvswitch]
/
datapath
/
dp_sysfs_dp.c
diff --git
a/datapath/dp_sysfs_dp.c
b/datapath/dp_sysfs_dp.c
index 413dfc31c232a3c2ddfc084ee99450e7fb8eae99..587b8bc2d5e40c17e379979e5ab71ef6b22b0260 100644
(file)
--- a/
datapath/dp_sysfs_dp.c
+++ b/
datapath/dp_sysfs_dp.c
@@
-43,7
+43,7
@@
#define DEV_ATTR(NAME) dev_attr_##NAME
#endif
#define DEV_ATTR(NAME) dev_attr_##NAME
#endif
-struct datapath *sysfs_get_dp(struct net_device *netdev)
+st
atic st
ruct datapath *sysfs_get_dp(struct net_device *netdev)
{
struct vport *vport = internal_dev_get_vport(netdev);
return vport ? vport->dp : NULL;
{
struct vport *vport = internal_dev_get_vport(netdev);
return vport ? vport->dp : NULL;
@@
-350,7
+350,8
@@
static struct attribute_group bridge_group = {
*/
int dp_sysfs_add_dp(struct datapath *dp)
{
*/
int dp_sysfs_add_dp(struct datapath *dp)
{
- struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]);
+ struct kobject *kobj =
+ vport_get_kobj(rtnl_dereference(dp->ports[ODPP_LOCAL]));
int err;
/* Create /sys/class/net/<devname>/bridge directory. */
int err;
/* Create /sys/class/net/<devname>/bridge directory. */
@@
-379,7
+380,8
@@
int dp_sysfs_add_dp(struct datapath *dp)
int dp_sysfs_del_dp(struct datapath *dp)
{
int dp_sysfs_del_dp(struct datapath *dp)
{
- struct kobject *kobj = vport_get_kobj(dp->ports[ODPP_LOCAL]);
+ struct kobject *kobj =
+ vport_get_kobj(rtnl_dereference(dp->ports[ODPP_LOCAL]));
kobject_del(&dp->ifobj);
sysfs_remove_group(kobj, &bridge_group);
kobject_del(&dp->ifobj);
sysfs_remove_group(kobj, &bridge_group);