Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / net / lcs.c

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0bf708944314d7a9f08b6c5fea917ffc1f462f97..09e7a053c8443afacf7440a4966e66a9ec26eb3d 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1189,7 +1189,8 @@ lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
        spin_lock_irqsave(&card->ipm_lock, flags);
        list_for_each(l, &card->ipm_list) {
                ipm = list_entry(l, struct lcs_ipm_list, list);
-               for (im4 = in4_dev->mc_list; im4 != NULL; im4 = im4->next) {
+               for (im4 = rcu_dereference(in4_dev->mc_list);
+                    im4 != NULL; im4 = rcu_dereference(im4->next_rcu)) {
                        lcs_get_mac_for_ipm(im4->multiaddr, buf, card->dev);
                        if ( (ipm->ipm.ip_addr == im4->multiaddr) &&
                             (memcmp(buf, &ipm->ipm.mac_addr,
@@ -1234,7 +1235,8 @@ lcs_set_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)
        unsigned long flags;
 
        LCS_DBF_TEXT(4, trace, "setmclst");
-       for (im4 = in4_dev->mc_list; im4; im4 = im4->next) {
+       for (im4 = rcu_dereference(in4_dev->mc_list); im4 != NULL;
+            im4 = rcu_dereference(im4->next_rcu)) {
                lcs_get_mac_for_ipm(im4->multiaddr, buf, card->dev);
                ipm = lcs_check_addr_entry(card, im4, buf);
                if (ipm != NULL)
@@ -1270,10 +1272,10 @@ lcs_register_mc_addresses(void *data)
        in4_dev = in_dev_get(card->dev);
        if (in4_dev == NULL)
                goto out;
-       read_lock(&in4_dev->mc_list_lock);
+       rcu_read_lock();
        lcs_remove_mc_addresses(card,in4_dev);
        lcs_set_mc_addresses(card, in4_dev);
-       read_unlock(&in4_dev->mc_list_lock);
+       rcu_read_unlock();
        in_dev_put(in4_dev);
 
        netif_carrier_off(card->dev);