Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / net / lcs.c

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0f19d540b655be900be7e946fd0838c77d95bb03..30b2a820e67019ae28d2b899d1bc032d7b37b9ee 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -26,6 +26,7 @@
 #define KMSG_COMPONENT         "lcs"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/if.h>
 #include <linux/netdevice.h>
@@ -840,7 +841,7 @@ lcs_notify_lancmd_waiters(struct lcs_card *card, struct lcs_cmd *cmd)
 }
 
 /**
- * Emit buffer of a lan comand.
+ * Emit buffer of a lan command.
  */
 static void
 lcs_lancmd_timeout(unsigned long data)
@@ -1188,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,
@@ -1233,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)
@@ -1269,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);
@@ -1396,6 +1399,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
        int rc, index;
        int cstat, dstat;
 
+       kstat_cpu(smp_processor_id()).irqs[IOINT_LCS]++;
        if (lcs_check_irb_error(cdev, irb))
                return;