Commit 96b8eaa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IRDA] irda-usb: use NULL instead of 0
  [IPV4]: Remove likely in ip_rcv_finish()
  [NET]: Create netdev attribute_groups with class_device_add
  [CLASS DEVICE]: add attribute_group creation
parents bed7a560 0eb1bd21

drivers/base/class.c

+32 −0
Original line number Diff line number Diff line
@@ -456,6 +456,35 @@ static void class_device_remove_attrs(struct class_device * cd) 
	}

}



static int class_device_add_groups(struct class_device * cd)

{

	int i;

	int error = 0;



	if (cd->groups) {

		for (i = 0; cd->groups[i]; i++) {

			error = sysfs_create_group(&cd->kobj, cd->groups[i]);

			if (error) {

				while (--i >= 0)

					sysfs_remove_group(&cd->kobj, cd->groups[i]);

				goto out;

			}

		}

	}

out:

	return error;

}



static void class_device_remove_groups(struct class_device * cd)

{

	int i;

	if (cd->groups) {

		for (i = 0; cd->groups[i]; i++) {

			sysfs_remove_group(&cd->kobj, cd->groups[i]);

		}

	}

}



static ssize_t show_dev(struct class_device *class_dev, char *buf)

{

	return print_dev_t(buf, class_dev->devt);
@@ -559,6 +588,8 @@ int class_device_add(struct class_device *class_dev) 
				  class_name);

	}



	class_device_add_groups(class_dev);



	kobject_uevent(&class_dev->kobj, KOBJ_ADD);



	/* notify any interfaces this device is now here */
@@ -672,6 +703,7 @@ void class_device_del(struct class_device *class_dev) 
	if (class_dev->devt_attr)

		class_device_remove_file(class_dev, class_dev->devt_attr);

	class_device_remove_attrs(class_dev);

	class_device_remove_groups(class_dev);



	kobject_uevent(&class_dev->kobj, KOBJ_REMOVE);

	kobject_del(&class_dev->kobj);

drivers/net/irda/irda-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1778,7 +1778,7 @@ static int irda_usb_probe(struct usb_interface *intf, 


	if (self->needspatch) {

		ret = usb_control_msg (self->usbdev, usb_sndctrlpipe (self->usbdev, 0),

				       0x02, 0x40, 0, 0, 0, 0, msecs_to_jiffies(500));

				       0x02, 0x40, 0, 0, NULL, 0, 500);

		if (ret < 0) {

			IRDA_DEBUG (0, "usb_control_msg failed %d\n", ret);

			goto err_out_3;

include/linux/device.h

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ extern int class_device_create_file(struct class_device *, 
 * @node: for internal use by the driver core only.

 * @kobj: for internal use by the driver core only.

 * @devt_attr: for internal use by the driver core only.

 * @groups: optional additional groups to be created

 * @dev: if set, a symlink to the struct device is created in the sysfs

 * directory for this struct class device.

 * @class_data: pointer to whatever you want to store here for this struct
@@ -228,6 +229,7 @@ struct class_device { 
	struct device		* dev;		/* not necessary, but nice to have */

	void			* class_data;	/* class-specific data */

	struct class_device	*parent;	/* parent of this child device, if there is one */

	struct attribute_group  ** groups;	/* optional groups */



	void	(*release)(struct class_device *dev);

	int	(*uevent)(struct class_device *dev, char **envp,

include/linux/netdevice.h

+2 −0
Original line number Diff line number Diff line
@@ -506,6 +506,8 @@ struct net_device 


	/* class/net/name entry */

	struct class_device	class_dev;

	/* space for optional statistics and wireless sysfs groups */

	struct attribute_group  *sysfs_groups[3];

};



#define	NETDEV_ALIGN		32

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -3043,11 +3043,11 @@ void netdev_run_todo(void) 


		switch(dev->reg_state) {

		case NETREG_REGISTERING:

			dev->reg_state = NETREG_REGISTERED;

			err = netdev_register_sysfs(dev);

			if (err)

				printk(KERN_ERR "%s: failed sysfs registration (%d)\n",

				       dev->name, err);

			dev->reg_state = NETREG_REGISTERED;

			break;



		case NETREG_UNREGISTERING: