[ewg] [for OFED 1.3 PATCH 2/2] IB/ipoib: enable IGMP for userpsace multicast IB apps

[Or Gerlitz]

Michael,

This patch needs to go to all the directories under kernel_patches/backport that contain the
ipoib_class_device_to_2_6_20.patch, I suggest it would be named ipoib_class_device_to_2_6_20_umcast.patch

------------
backport kernel_patches/fixes/zzz_ipoib_allow_umcast.patch to older kernels

Signed-off-by: Or Gerlitz <ogerlitz at voltaire.com>

Index: ofa_kernel-1.3-work/drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
--- ofa_kernel-1.3-work.orig/drivers/infiniband/ulp/ipoib/ipoib_main.c	2007-09-25 19:54:15.000000000 +0200
+++ ofa_kernel-1.3-work/drivers/infiniband/ulp/ipoib/ipoib_main.c	2007-09-25 20:01:32.000000000 +0200
@@ -1160,8 +1160,7 @@ int ipoib_add_pkey_attr(struct net_devic
 					&class_device_attr_pkey);
 }

-static ssize_t show_umcast(struct device *dev,
-			   struct device_attribute *attr, char *buf)
+static ssize_t show_umcast(struct class_device *dev, char *buf)
 {
 	struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));

@@ -1171,8 +1170,7 @@ static ssize_t show_umcast(struct device
 		return sprintf(buf, "0\n");
 }

-static ssize_t set_umcast(struct device *dev,
-			  struct device_attribute *attr,
+static ssize_t set_umcast(struct class_device *dev,
 			  const char *buf, size_t count)
 {
  	struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));
@@ -1191,11 +1189,12 @@ static ssize_t set_umcast(struct device

  	return -EINVAL;
 }
-static DEVICE_ATTR(umcast, S_IWUSR | S_IRUGO, show_umcast, set_umcast);
+static CLASS_DEVICE_ATTR(umcast, S_IWUSR | S_IRUGO, show_umcast, set_umcast);

 int ipoib_add_umcast_attr(struct net_device *dev)
 {
-	return device_create_file(&dev->dev, &dev_attr_umcast);
+	return class_device_create_file(&dev->class_dev,
+					&class_device_attr_umcast);
 }

 static void set_tx_csum(struct net_device *dev)