The following commit has been merged in the merge/master branch: commit 3a86e3b60f762eca150cfa1ccaadfe3423658e96 Merge: 24937d754e29a26b0690955585dc99a7fd830db0 f72bd3ea731be52769f44df7f4c0cc1054ca3902 Author: Antonio Quartulli ordex@autistici.org Date: Mon Oct 29 09:35:34 2012 +0100
Merge remote-tracking branch 'pkg/master' into merge/master
diff --combined net/batman-adv/sysfs.c index cc56ed0,9dc58b5..9dc58b5 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@@ -120,56 -120,6 +120,6 @@@ ssize_t batadv_show_##_name(struct kobj static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\ static BATADV_ATTR_SIF_SHOW_UINT(_name) \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ - batadv_store_##_name) - - - #define BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min, _max, _post_func) \ - ssize_t batadv_store_##_name(struct kobject *kobj, \ - struct attribute *attr, char *buff, \ - size_t count) \ - { \ - struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ - struct batadv_hard_iface *hard_iface; \ - ssize_t length; \ - \ - hard_iface = batadv_hardif_get_by_netdev(net_dev); \ - if (!hard_iface) \ - return 0; \ - \ - length = __batadv_store_uint_attr(buff, count, _min, _max, \ - _post_func, attr, \ - &hard_iface->_var, net_dev); \ - \ - batadv_hardif_free_ref(hard_iface); \ - return length; \ - } - - #define BATADV_ATTR_HIF_SHOW_UINT(_name, _var) \ - ssize_t batadv_show_##_name(struct kobject *kobj, \ - struct attribute *attr, char *buff) \ - { \ - struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ - struct batadv_hard_iface *hard_iface; \ - ssize_t length; \ - \ - hard_iface = batadv_hardif_get_by_netdev(net_dev); \ - if (!hard_iface) \ - return 0; \ - \ - length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_var)); \ - \ - batadv_hardif_free_ref(hard_iface); \ - return length; \ - } - - /* Use this, if you are going to set [name] in hard_iface to an - * unsigned integer value - */ - #define BATADV_ATTR_HIF_UINT(_name, _var, _mode, _min, _max, _post_func)\ - static BATADV_ATTR_HIF_STORE_UINT(_name, _var, _min, \ - _max, _post_func) \ - static BATADV_ATTR_HIF_SHOW_UINT(_name, _var) \ - static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name)