netfilter: Use unsigned types for hooknum and pf vars

[safe/jmp/linux-2.6] / include / linux / sysdev.h

diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index f752e73..f395bb3 100644 (file)
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -45,12 +45,16 @@ struct sysdev_class_attribute {
        ssize_t (*store)(struct sysdev_class *, const char *, size_t);
 };
 
-#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)            \
-struct sysdev_class_attribute attr_##_name = {                         \
+#define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)           \
+{                                                              \
        .attr = {.name = __stringify(_name), .mode = _mode },   \
        .show   = _show,                                        \
        .store  = _store,                                       \
-};
+}
+
+#define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)            \
+       struct sysdev_class_attribute attr_##_name =            \
+               _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store)
 
 
 extern int sysdev_class_register(struct sysdev_class *);
@@ -95,22 +99,58 @@ extern void sysdev_unregister(struct sys_device *);
 
 struct sysdev_attribute { 
        struct attribute        attr;
-       ssize_t (*show)(struct sys_device *, char *);
-       ssize_t (*store)(struct sys_device *, const char *, size_t);
+       ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *);
+       ssize_t (*store)(struct sys_device *, struct sysdev_attribute *,
+                        const char *, size_t);
 };
 
 
-#define _SYSDEV_ATTR(_name,_mode,_show,_store)                 \
+#define _SYSDEV_ATTR(_name, _mode, _show, _store)              \
 {                                                              \
        .attr = { .name = __stringify(_name), .mode = _mode },  \
        .show   = _show,                                        \
        .store  = _store,                                       \
 }
 
-#define SYSDEV_ATTR(_name,_mode,_show,_store)          \
-struct sysdev_attribute attr_##_name = _SYSDEV_ATTR(_name,_mode,_show,_store);
+#define SYSDEV_ATTR(_name, _mode, _show, _store)               \
+       struct sysdev_attribute attr_##_name =                  \
+               _SYSDEV_ATTR(_name, _mode, _show, _store);
 
 extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *);
 extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *);
 
+struct sysdev_ext_attribute {
+       struct sysdev_attribute attr;
+       void *var;
+};
+
+/*
+ * Support for simple variable sysdev attributes.
+ * The pointer to the variable is stored in a sysdev_ext_attribute
+ */
+
+/* Add more types as needed */
+
+extern ssize_t sysdev_show_ulong(struct sys_device *, struct sysdev_attribute *,
+                               char *);
+extern ssize_t sysdev_store_ulong(struct sys_device *,
+                       struct sysdev_attribute *, const char *, size_t);
+extern ssize_t sysdev_show_int(struct sys_device *, struct sysdev_attribute *,
+                               char *);
+extern ssize_t sysdev_store_int(struct sys_device *,
+                       struct sysdev_attribute *, const char *, size_t);
+
+#define _SYSDEV_ULONG_ATTR(_name, _mode, _var)                         \
+       { _SYSDEV_ATTR(_name, _mode, sysdev_show_ulong, sysdev_store_ulong), \
+         &(_var) }
+#define SYSDEV_ULONG_ATTR(_name, _mode, _var)                  \
+       struct sysdev_ext_attribute attr_##_name =              \
+               _SYSDEV_ULONG_ATTR(_name, _mode, _var);
+#define _SYSDEV_INT_ATTR(_name, _mode, _var)                           \
+       { _SYSDEV_ATTR(_name, _mode, sysdev_show_int, sysdev_store_int), \
+         &(_var) }
+#define SYSDEV_INT_ATTR(_name, _mode, _var)                    \
+       struct sysdev_ext_attribute attr_##_name =              \
+               _SYSDEV_INT_ATTR(_name, _mode, _var);
+
 #endif /* _SYSDEV_H_ */