summaryrefslogtreecommitdiff
path: root/net/8021q/vlan_core.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-12-14 00:29:43 +0400
committerDavid S. Miller <davem@davemloft.net>2011-12-14 11:39:30 +0400
commitf9586f79bf6125ae28fab9f585094c56e8740e83 (patch)
treeeea369cc3ac135bc9841c453ffdb2b81cc72d884 /net/8021q/vlan_core.c
parentc63044f0d22a13532047ad04216af45b6ac7fdaf (diff)
downloadlinux-f9586f79bf6125ae28fab9f585094c56e8740e83.tar.xz
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: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_core.c')
-rw-r--r--net/8021q/vlan_core.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 1414c931bd3f..4d39d802be2c 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -326,14 +326,16 @@ int vlan_vids_add_by_dev(struct net_device *dev,
const struct net_device *by_dev)
{
struct vlan_vid_info *vid_info;
+ struct vlan_info *vlan_info;
int err;
ASSERT_RTNL();
- if (!by_dev->vlan_info)
+ vlan_info = rtnl_dereference(by_dev->vlan_info);
+ if (!vlan_info)
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);
if (err)
goto unwind;
@@ -342,7 +344,7 @@ int vlan_vids_add_by_dev(struct net_device *dev,
unwind:
list_for_each_entry_continue_reverse(vid_info,
- &by_dev->vlan_info->vid_list,
+ &vlan_info->vid_list,
list) {
vlan_vid_del(dev, vid_info->vid);
}
@@ -355,13 +357,15 @@ void vlan_vids_del_by_dev(struct net_device *dev,
const struct net_device *by_dev)
{
struct vlan_vid_info *vid_info;
+ struct vlan_info *vlan_info;
ASSERT_RTNL();
- if (!by_dev->vlan_info)
+ vlan_info = rtnl_dereference(by_dev->vlan_info);
+ if (!vlan_info)
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);
}
EXPORT_SYMBOL(vlan_vids_del_by_dev);