From fa9cc0e4062ce98addbca8121071e5ef9e0bc19c Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Thu, 9 May 2013 04:23:40 +0000 Subject: [PATCH] --- yaml --- r: 375527 b: refs/heads/master c: 233c7df0821c4190e2d3f4be0f2ca0ab40a5ed8c h: refs/heads/master i: 375525: 0d209241b613bc31cd45fce8abd5cb2932bd7b4b 375523: e94e59a3507e4646fdf5897326c2da40c51eb2b9 375519: 9eaffd2e9fefcc9b396a28147515bac9bf122566 v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a111eac876e8..bb34abbed63c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb863b8beaf8121199c3dc32ab0126e8ce9cb34a +refs/heads/master: 233c7df0821c4190e2d3f4be0f2ca0ab40a5ed8c diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index d5a141c7c4e7..1c502bb0c916 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -229,7 +229,8 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) } if (port->passthru) - vlan = list_first_entry(&port->vlans, struct macvlan_dev, list); + vlan = list_first_or_null_rcu(&port->vlans, + struct macvlan_dev, list); else vlan = macvlan_hash_lookup(port, eth->h_dest); if (vlan == NULL) @@ -814,7 +815,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, if (err < 0) goto upper_dev_unlink; - list_add_tail(&vlan->list, &port->vlans); + list_add_tail_rcu(&vlan->list, &port->vlans); netif_stacked_transfer_operstate(lowerdev, dev); return 0; @@ -842,7 +843,7 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head) { struct macvlan_dev *vlan = netdev_priv(dev); - list_del(&vlan->list); + list_del_rcu(&vlan->list); unregister_netdevice_queue(dev, head); netdev_upper_dev_unlink(vlan->lowerdev, dev); }