From cb37720989e118daf89ce3d2cdaaa2888ddd9b20 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 20 Mar 2012 09:57:56 -0500 Subject: [PATCH 1/4] dahdi: Update dev_set_name / dev_name for RHEL 5.6+. This is needed because dev_name() is mapped to kobject_name() in a backport, but the kobject name isn't set until after device_add(). The result would be parentless devices would fail since dahdi would not think a name was set for these devices. For these systems, we'll set both the bus_id string and the underlying kobject_name. Signed-off-by: Shaun Ruffell --- include/dahdi/kernel.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 93d0046..6f397c1 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -79,16 +79,25 @@ #define DAHDI_IRQ_DISABLED IRQF_DISABLED #define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) # ifdef RHEL_RELEASE_VERSION # if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6) #define dev_name(dev) ((dev)->bus_id) +#define dev_set_name(dev, format, ...) \ + snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__) +# else +#define dev_set_name(dev, format, ...) \ + do { \ + kobject_set_name(&(dev)->kobj, format, ## __VA_ARGS__); \ + snprintf((dev)->bus_id, BUS_ID_SIZE, \ + kobject_name(&(dev)->kobj)); \ + } while (0) # endif # else #define dev_name(dev) ((dev)->bus_id) -# endif #define dev_set_name(dev, format, ...) \ snprintf((dev)->bus_id, BUS_ID_SIZE, format, ## __VA_ARGS__) +# endif #endif /*! Default chunk size for conferences and such -- static right now, might make -- 1.7.9.GIT