Commit f9586f79 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

vlan: add rtnl_dereference() annotations

The original code generates a Sparse warning:
net/8021q/vlan_core.c:336:9:
	error: incompatible types in comparison expression (different address spaces)

It's ok to dereference __rcu pointers here because we are holding the
RTNL lock.  I've added some calls to rtnl_dereference() to silence the
warning.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c63044f0
...@@ -326,14 +326,16 @@ int vlan_vids_add_by_dev(struct net_device *dev, ...@@ -326,14 +326,16 @@ int vlan_vids_add_by_dev(struct net_device *dev,
const struct net_device *by_dev) const struct net_device *by_dev)
{ {
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
struct vlan_info *vlan_info;
int err; int err;
ASSERT_RTNL(); ASSERT_RTNL();
if (!by_dev->vlan_info) vlan_info = rtnl_dereference(by_dev->vlan_info);
if (!vlan_info)
return 0; return 0;
list_for_each_entry(vid_info, &by_dev->vlan_info->vid_list, list) { list_for_each_entry(vid_info, &vlan_info->vid_list, list) {
err = vlan_vid_add(dev, vid_info->vid); err = vlan_vid_add(dev, vid_info->vid);
if (err) if (err)
goto unwind; goto unwind;
...@@ -342,7 +344,7 @@ int vlan_vids_add_by_dev(struct net_device *dev, ...@@ -342,7 +344,7 @@ int vlan_vids_add_by_dev(struct net_device *dev,
unwind: unwind:
list_for_each_entry_continue_reverse(vid_info, list_for_each_entry_continue_reverse(vid_info,
&by_dev->vlan_info->vid_list, &vlan_info->vid_list,
list) { list) {
vlan_vid_del(dev, vid_info->vid); vlan_vid_del(dev, vid_info->vid);
} }
...@@ -355,13 +357,15 @@ void vlan_vids_del_by_dev(struct net_device *dev, ...@@ -355,13 +357,15 @@ void vlan_vids_del_by_dev(struct net_device *dev,
const struct net_device *by_dev) const struct net_device *by_dev)
{ {
struct vlan_vid_info *vid_info; struct vlan_vid_info *vid_info;
struct vlan_info *vlan_info;
ASSERT_RTNL(); ASSERT_RTNL();
if (!by_dev->vlan_info) vlan_info = rtnl_dereference(by_dev->vlan_info);
if (!vlan_info)
return; return;
list_for_each_entry(vid_info, &by_dev->vlan_info->vid_list, list) list_for_each_entry(vid_info, &vlan_info->vid_list, list)
vlan_vid_del(dev, vid_info->vid); vlan_vid_del(dev, vid_info->vid);
} }
EXPORT_SYMBOL(vlan_vids_del_by_dev); EXPORT_SYMBOL(vlan_vids_del_by_dev);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment