Commit 1d5873e9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 



Included changes:
- yet another batch of 'namespace cleaning' patches

Conflicts:
	net/batman-adv/translation-table.c

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7665de15 a513088d

net/batman-adv/bat_debugfs.c

+72 −71
Original line number Diff line number Diff line
@@ -32,25 +32,25 @@ 
#include "icmp_socket.h"

#include "bridge_loop_avoidance.h"



static struct dentry *bat_debugfs;

static struct dentry *batadv_debugfs;



#ifdef CONFIG_BATMAN_ADV_DEBUG

#define LOG_BUFF_MASK (log_buff_len-1)

#define LOG_BUFF_MASK (batadv_log_buff_len - 1)

#define LOG_BUFF(idx) (debug_log->log_buff[(idx) & LOG_BUFF_MASK])



static int log_buff_len = LOG_BUF_LEN;

static int batadv_log_buff_len = LOG_BUF_LEN;



static void emit_log_char(struct debug_log *debug_log, char c)

static void batadv_emit_log_char(struct debug_log *debug_log, char c)

{

	LOG_BUFF(debug_log->log_end) = c;

	debug_log->log_end++;



	if (debug_log->log_end - debug_log->log_start > log_buff_len)

		debug_log->log_start = debug_log->log_end - log_buff_len;

	if (debug_log->log_end - debug_log->log_start > batadv_log_buff_len)

		debug_log->log_start = debug_log->log_end - batadv_log_buff_len;

}



__printf(2, 3)

static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...)

static int batadv_fdebug_log(struct debug_log *debug_log, const char *fmt, ...)

{

	va_list args;

	static char debug_log_buf[256];
@@ -65,7 +65,7 @@ static int fdebug_log(struct debug_log *debug_log, const char *fmt, ...) 
	va_end(args);



	for (p = debug_log_buf; *p != 0; p++)

		emit_log_char(debug_log, *p);

		batadv_emit_log_char(debug_log, *p);



	spin_unlock_bh(&debug_log->lock);
@@ -81,14 +81,14 @@ int batadv_debug_log(struct bat_priv *bat_priv, const char *fmt, ...) 


	va_start(args, fmt);

	vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);

	fdebug_log(bat_priv->debug_log, "[%10u] %s",

	batadv_fdebug_log(bat_priv->debug_log, "[%10u] %s",

			  jiffies_to_msecs(jiffies), tmp_log_buf);

	va_end(args);



	return 0;

}



static int log_open(struct inode *inode, struct file *file)

static int batadv_log_open(struct inode *inode, struct file *file)

{

	nonseekable_open(inode, file);

	file->private_data = inode->i_private;
@@ -96,13 +96,13 @@ static int log_open(struct inode *inode, struct file *file) 
	return 0;

}



static int log_release(struct inode *inode, struct file *file)

static int batadv_log_release(struct inode *inode, struct file *file)

{

	batadv_dec_module_count();

	return 0;

}



static ssize_t log_read(struct file *file, char __user *buf,

static ssize_t batadv_log_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

{

	struct bat_priv *bat_priv = file->private_data;
@@ -156,7 +156,7 @@ static ssize_t log_read(struct file *file, char __user *buf, 
	return error;

}



static unsigned int log_poll(struct file *file, poll_table *wait)

static unsigned int batadv_log_poll(struct file *file, poll_table *wait)

{

	struct bat_priv *bat_priv = file->private_data;

	struct debug_log *debug_log = bat_priv->debug_log;
@@ -169,15 +169,15 @@ static unsigned int log_poll(struct file *file, poll_table *wait) 
	return 0;

}



static const struct file_operations log_fops = {

	.open           = log_open,

	.release        = log_release,

	.read           = log_read,

	.poll           = log_poll,

static const struct file_operations batadv_log_fops = {

	.open           = batadv_log_open,

	.release        = batadv_log_release,

	.read           = batadv_log_read,

	.poll           = batadv_log_poll,

	.llseek         = no_llseek,

};



static int debug_log_setup(struct bat_priv *bat_priv)

static int batadv_debug_log_setup(struct bat_priv *bat_priv)

{

	struct dentry *d;
@@ -192,7 +192,8 @@ static int debug_log_setup(struct bat_priv *bat_priv) 
	init_waitqueue_head(&bat_priv->debug_log->queue_wait);



	d = debugfs_create_file("log", S_IFREG | S_IRUSR,

				bat_priv->debug_dir, bat_priv, &log_fops);

				bat_priv->debug_dir, bat_priv,

				&batadv_log_fops);

	if (!d)

		goto err;
@@ -202,49 +203,49 @@ static int debug_log_setup(struct bat_priv *bat_priv) 
	return -ENOMEM;

}



static void debug_log_cleanup(struct bat_priv *bat_priv)

static void batadv_debug_log_cleanup(struct bat_priv *bat_priv)

{

	kfree(bat_priv->debug_log);

	bat_priv->debug_log = NULL;

}

#else /* CONFIG_BATMAN_ADV_DEBUG */

static int debug_log_setup(struct bat_priv *bat_priv)

static int batadv_debug_log_setup(struct bat_priv *bat_priv)

{

	bat_priv->debug_log = NULL;

	return 0;

}



static void debug_log_cleanup(struct bat_priv *bat_priv)

static void batadv_debug_log_cleanup(struct bat_priv *bat_priv)

{

	return;

}

#endif



static int bat_algorithms_open(struct inode *inode, struct file *file)

static int batadv_algorithms_open(struct inode *inode, struct file *file)

{

	return single_open(file, batadv_algo_seq_print_text, NULL);

}



static int originators_open(struct inode *inode, struct file *file)

static int batadv_originators_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_orig_seq_print_text, net_dev);

}



static int gateways_open(struct inode *inode, struct file *file)

static int batadv_gateways_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_gw_client_seq_print_text, net_dev);

}



static int transtable_global_open(struct inode *inode, struct file *file)

static int batadv_transtable_global_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_tt_global_seq_print_text, net_dev);

}



#ifdef CONFIG_BATMAN_ADV_BLA

static int bla_claim_table_open(struct inode *inode, struct file *file)

static int batadv_bla_claim_table_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_bla_claim_table_seq_print_text,
@@ -252,13 +253,13 @@ static int bla_claim_table_open(struct inode *inode, struct file *file) 
}

#endif



static int transtable_local_open(struct inode *inode, struct file *file)

static int batadv_transtable_local_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_tt_local_seq_print_text, net_dev);

}



static int vis_data_open(struct inode *inode, struct file *file)

static int batadv_vis_data_open(struct inode *inode, struct file *file)

{

	struct net_device *net_dev = (struct net_device *)inode->i_private;

	return single_open(file, batadv_vis_seq_print_text, net_dev);
@@ -270,7 +271,7 @@ struct bat_debuginfo { 
};



#define BAT_DEBUGINFO(_name, _mode, _open)		\

struct bat_debuginfo bat_debuginfo_##_name = {	\

struct bat_debuginfo batadv_debuginfo_##_name = {	\

	.attr = { .name = __stringify(_name),		\

		  .mode = _mode, },			\

	.fops = { .owner = THIS_MODULE,			\
@@ -281,25 +282,25 @@ struct bat_debuginfo bat_debuginfo_##_name = { \ 
		}					\

};



static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open);

static BAT_DEBUGINFO(originators, S_IRUGO, originators_open);

static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open);

static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open);

static BAT_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);

static BAT_DEBUGINFO(originators, S_IRUGO, batadv_originators_open);

static BAT_DEBUGINFO(gateways, S_IRUGO, batadv_gateways_open);

static BAT_DEBUGINFO(transtable_global, S_IRUGO, batadv_transtable_global_open);

#ifdef CONFIG_BATMAN_ADV_BLA

static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open);

static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, batadv_bla_claim_table_open);

#endif

static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open);

static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open);

static BAT_DEBUGINFO(transtable_local, S_IRUGO, batadv_transtable_local_open);

static BAT_DEBUGINFO(vis_data, S_IRUGO, batadv_vis_data_open);



static struct bat_debuginfo *mesh_debuginfos[] = {

	&bat_debuginfo_originators,

	&bat_debuginfo_gateways,

	&bat_debuginfo_transtable_global,

static struct bat_debuginfo *batadv_mesh_debuginfos[] = {

	&batadv_debuginfo_originators,

	&batadv_debuginfo_gateways,

	&batadv_debuginfo_transtable_global,

#ifdef CONFIG_BATMAN_ADV_BLA

	&bat_debuginfo_bla_claim_table,

	&batadv_debuginfo_bla_claim_table,

#endif

	&bat_debuginfo_transtable_local,

	&bat_debuginfo_vis_data,

	&batadv_debuginfo_transtable_local,

	&batadv_debuginfo_vis_data,

	NULL,

};
@@ -308,17 +309,17 @@ void batadv_debugfs_init(void) 
	struct bat_debuginfo *bat_debug;

	struct dentry *file;



	bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);

	if (bat_debugfs == ERR_PTR(-ENODEV))

		bat_debugfs = NULL;

	batadv_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);

	if (batadv_debugfs == ERR_PTR(-ENODEV))

		batadv_debugfs = NULL;



	if (!bat_debugfs)

	if (!batadv_debugfs)

		goto out;



	bat_debug = &bat_debuginfo_routing_algos;

	bat_debug = &batadv_debuginfo_routing_algos;

	file = debugfs_create_file(bat_debug->attr.name,

				   S_IFREG | bat_debug->attr.mode,

				   bat_debugfs, NULL, &bat_debug->fops);

				   batadv_debugfs, NULL, &bat_debug->fops);

	if (!file)

		pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name);
@@ -328,9 +329,9 @@ void batadv_debugfs_init(void) 


void batadv_debugfs_destroy(void)

{

	if (bat_debugfs) {

		debugfs_remove_recursive(bat_debugfs);

		bat_debugfs = NULL;

	if (batadv_debugfs) {

		debugfs_remove_recursive(batadv_debugfs);

		batadv_debugfs = NULL;

	}

}
@@ -340,20 +341,20 @@ int batadv_debugfs_add_meshif(struct net_device *dev) 
	struct bat_debuginfo **bat_debug;

	struct dentry *file;



	if (!bat_debugfs)

	if (!batadv_debugfs)

		goto out;



	bat_priv->debug_dir = debugfs_create_dir(dev->name, bat_debugfs);

	bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);

	if (!bat_priv->debug_dir)

		goto out;



	if (batadv_socket_setup(bat_priv) < 0)

		goto rem_attr;



	if (debug_log_setup(bat_priv) < 0)

	if (batadv_debug_log_setup(bat_priv) < 0)

		goto rem_attr;



	for (bat_debug = mesh_debuginfos; *bat_debug; ++bat_debug) {

	for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {

		file = debugfs_create_file(((*bat_debug)->attr).name,

					  S_IFREG | ((*bat_debug)->attr).mode,

					  bat_priv->debug_dir,
@@ -381,9 +382,9 @@ void batadv_debugfs_del_meshif(struct net_device *dev) 
{

	struct bat_priv *bat_priv = netdev_priv(dev);



	debug_log_cleanup(bat_priv);

	batadv_debug_log_cleanup(bat_priv);



	if (bat_debugfs) {

	if (batadv_debugfs) {

		debugfs_remove_recursive(bat_priv->debug_dir);

		bat_priv->debug_dir = NULL;

	}

net/batman-adv/bat_iv_ogm.c

+251 −239

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/bat_sysfs.c

+149 −128
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ 
#include "gateway_client.h"

#include "vis.h"



static struct net_device *kobj_to_netdev(struct kobject *obj)

static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)

{

	struct device *dev = container_of(obj->parent, struct device, kobj);

	return to_net_dev(dev);

}



static struct bat_priv *kobj_to_batpriv(struct kobject *obj)

static struct bat_priv *batadv_kobj_to_batpriv(struct kobject *obj)

{

	struct net_device *net_dev = kobj_to_netdev(obj);

	struct net_device *net_dev = batadv_kobj_to_netdev(obj);

	return netdev_priv(net_dev);

}
@@ -42,19 +42,19 @@ static struct bat_priv *kobj_to_batpriv(struct kobject *obj) 
#define UEV_ACTION_VAR	"BATACTION="

#define UEV_DATA_VAR	"BATDATA="



static char *uev_action_str[] = {

static char *batadv_uev_action_str[] = {

	"add",

	"del",

	"change"

};



static char *uev_type_str[] = {

static char *batadv_uev_type_str[] = {

	"gw"

};



/* Use this, if you have customized show and store functions */

#define BAT_ATTR(_name, _mode, _show, _store)	\

struct bat_attribute bat_attr_##_name = {	\

struct bat_attribute batadv_attr_##_name = {	\

	.attr = {.name = __stringify(_name),	\

		 .mode = _mode },		\

	.show   = _show,			\
@@ -62,20 +62,21 @@ struct bat_attribute bat_attr_##_name = { \ 
};



#define BAT_ATTR_SIF_STORE_BOOL(_name, _post_func)			\

ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,	\

		      char *buff, size_t count)				\

ssize_t batadv_store_##_name(struct kobject *kobj,			\

			     struct attribute *attr, char *buff,	\

			     size_t count)				\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\

	struct bat_priv *bat_priv = netdev_priv(net_dev);		\

	return __store_bool_attr(buff, count, _post_func, attr,		\

	return __batadv_store_bool_attr(buff, count, _post_func, attr,	\

					&bat_priv->_name, net_dev);	\

}



#define BAT_ATTR_SIF_SHOW_BOOL(_name)					\

ssize_t show_##_name(struct kobject *kobj,				\

ssize_t batadv_show_##_name(struct kobject *kobj,			\

			    struct attribute *attr, char *buff)		\

{									\

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);		\

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);	\

	return sprintf(buff, "%s\n",					\

		       atomic_read(&bat_priv->_name) == 0 ?		\

		       "disabled" : "enabled");				\
@@ -87,24 +88,27 @@ ssize_t show_##_name(struct kobject *kobj, \ 
#define BAT_ATTR_SIF_BOOL(_name, _mode, _post_func)			\

	static BAT_ATTR_SIF_STORE_BOOL(_name, _post_func)		\

	static BAT_ATTR_SIF_SHOW_BOOL(_name)				\

	static BAT_ATTR(_name, _mode, show_##_name, store_##_name)

	static BAT_ATTR(_name, _mode, batadv_show_##_name,		\

			batadv_store_##_name)





#define BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)		\

ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,	\

		      char *buff, size_t count)				\

ssize_t batadv_store_##_name(struct kobject *kobj,			\

			     struct attribute *attr, char *buff,	\

			     size_t count)				\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\

	struct bat_priv *bat_priv = netdev_priv(net_dev);		\

	return __store_uint_attr(buff, count, _min, _max, _post_func,	\

				 attr, &bat_priv->_name, net_dev);	\

	return __batadv_store_uint_attr(buff, count, _min, _max,	\

					_post_func, attr,		\

					&bat_priv->_name, net_dev);	\

}



#define BAT_ATTR_SIF_SHOW_UINT(_name)					\

ssize_t show_##_name(struct kobject *kobj,				\

ssize_t batadv_show_##_name(struct kobject *kobj,			\

			    struct attribute *attr, char *buff)		\

{									\

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);		\

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);	\

	return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name));	\

}									\
@@ -114,14 +118,16 @@ ssize_t show_##_name(struct kobject *kobj, \ 
#define BAT_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func)		\

	static BAT_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)	\

	static BAT_ATTR_SIF_SHOW_UINT(_name)				\

	static BAT_ATTR(_name, _mode, show_##_name, store_##_name)

	static BAT_ATTR(_name, _mode, batadv_show_##_name,		\

			batadv_store_##_name)





#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)		\

ssize_t store_##_name(struct kobject *kobj, struct attribute *attr,	\

		      char *buff, size_t count)				\

ssize_t batadv_store_##_name(struct kobject *kobj,			\

			     struct attribute *attr, char *buff,	\

			     size_t count)				\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\

	struct hard_iface *hard_iface;					\

	ssize_t length;							\

									\
@@ -129,18 +135,19 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ 
	if (!hard_iface)						\

		return 0;						\

									\

	length = __store_uint_attr(buff, count, _min, _max, _post_func,	\

				   attr, &hard_iface->_name, net_dev);	\

	length = __batadv_store_uint_attr(buff, count, _min, _max,	\

					  _post_func, attr,		\

					  &hard_iface->_name, net_dev);	\

									\

	hardif_free_ref(hard_iface);					\

	batadv_hardif_free_ref(hard_iface);				\

	return length;							\

}



#define BAT_ATTR_HIF_SHOW_UINT(_name)					\

ssize_t show_##_name(struct kobject *kobj,				\

ssize_t batadv_show_##_name(struct kobject *kobj,			\

			    struct attribute *attr, char *buff)		\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);	\

	struct hard_iface *hard_iface;					\

	ssize_t length;							\

									\
@@ -150,7 +157,7 @@ ssize_t show_##_name(struct kobject *kobj, \ 
									\

	length = sprintf(buff, "%i\n", atomic_read(&hard_iface->_name));\

									\

	hardif_free_ref(hard_iface);					\

	batadv_hardif_free_ref(hard_iface);				\

	return length;							\

}
@@ -160,10 +167,11 @@ ssize_t show_##_name(struct kobject *kobj, \ 
#define BAT_ATTR_HIF_UINT(_name, _mode, _min, _max, _post_func)		\

	static BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func)	\

	static BAT_ATTR_HIF_SHOW_UINT(_name)				\

	static BAT_ATTR(_name, _mode, show_##_name, store_##_name)

	static BAT_ATTR(_name, _mode, batadv_show_##_name,		\

			batadv_store_##_name)





static int store_bool_attr(char *buff, size_t count,

static int batadv_store_bool_attr(char *buff, size_t count,

				  struct net_device *net_dev,

				  const char *attr_name, atomic_t *attr)

{
@@ -200,23 +208,27 @@ static int store_bool_attr(char *buff, size_t count, 
	return count;

}



static inline ssize_t __store_bool_attr(char *buff, size_t count,

static inline ssize_t

__batadv_store_bool_attr(char *buff, size_t count,

			 void (*post_func)(struct net_device *),

			 struct attribute *attr,

			 atomic_t *attr_store, struct net_device *net_dev)

{

	int ret;



	ret = store_bool_attr(buff, count, net_dev, attr->name, attr_store);

	ret = batadv_store_bool_attr(buff, count, net_dev, attr->name,

				     attr_store);

	if (post_func && ret)

		post_func(net_dev);



	return ret;

}



static int store_uint_attr(const char *buff, size_t count,

			   struct net_device *net_dev, const char *attr_name,

			   unsigned int min, unsigned int max, atomic_t *attr)

static int batadv_store_uint_attr(const char *buff, size_t count,

				  struct net_device *net_dev,

				  const char *attr_name,

				  unsigned int min, unsigned int max,

				  atomic_t *attr)

{

	unsigned long uint_val;

	int ret;
@@ -251,7 +263,8 @@ static int store_uint_attr(const char *buff, size_t count, 
	return count;

}



static inline ssize_t __store_uint_attr(const char *buff, size_t count,

static inline ssize_t

__batadv_store_uint_attr(const char *buff, size_t count,

			 int min, int max,

			 void (*post_func)(struct net_device *),

			 const struct attribute *attr,
@@ -259,18 +272,18 @@ static inline ssize_t __store_uint_attr(const char *buff, size_t count, 
{

	int ret;



	ret = store_uint_attr(buff, count, net_dev, attr->name,

			      min, max, attr_store);

	ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max,

				     attr_store);

	if (post_func && ret)

		post_func(net_dev);



	return ret;

}



static ssize_t show_vis_mode(struct kobject *kobj, struct attribute *attr,

			     char *buff)

static ssize_t batadv_show_vis_mode(struct kobject *kobj,

				    struct attribute *attr, char *buff)

{

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);

	int vis_mode = atomic_read(&bat_priv->vis_mode);



	return sprintf(buff, "%s\n",
@@ -278,10 +291,11 @@ static ssize_t show_vis_mode(struct kobject *kobj, struct attribute *attr, 
							"client" : "server");

}



static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr,

			      char *buff, size_t count)

static ssize_t batadv_store_vis_mode(struct kobject *kobj,

				     struct attribute *attr, char *buff,

				     size_t count)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct bat_priv *bat_priv = netdev_priv(net_dev);

	unsigned long val;

	int ret, vis_mode_tmp = -1;
@@ -319,23 +333,23 @@ static ssize_t store_vis_mode(struct kobject *kobj, struct attribute *attr, 
	return count;

}



static ssize_t show_bat_algo(struct kobject *kobj, struct attribute *attr,

			    char *buff)

static ssize_t batadv_show_bat_algo(struct kobject *kobj,

				    struct attribute *attr, char *buff)

{

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);

	return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name);

}



static void post_gw_deselect(struct net_device *net_dev)

static void batadv_post_gw_deselect(struct net_device *net_dev)

{

	struct bat_priv *bat_priv = netdev_priv(net_dev);

	batadv_gw_deselect(bat_priv);

}



static ssize_t show_gw_mode(struct kobject *kobj, struct attribute *attr,

static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,

				   char *buff)

{

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);

	int bytes_written;



	switch (atomic_read(&bat_priv->gw_mode)) {
@@ -353,10 +367,11 @@ static ssize_t show_gw_mode(struct kobject *kobj, struct attribute *attr, 
	return bytes_written;

}



static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr,

			     char *buff, size_t count)

static ssize_t batadv_store_gw_mode(struct kobject *kobj,

				    struct attribute *attr, char *buff,

				    size_t count)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct bat_priv *bat_priv = netdev_priv(net_dev);

	char *curr_gw_mode_str;

	int gw_mode_tmp = -1;
@@ -405,10 +420,10 @@ static ssize_t store_gw_mode(struct kobject *kobj, struct attribute *attr, 
	return count;

}



static ssize_t show_gw_bwidth(struct kobject *kobj, struct attribute *attr,

			      char *buff)

static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,

				     struct attribute *attr, char *buff)

{

	struct bat_priv *bat_priv = kobj_to_batpriv(kobj);

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);

	int down, up;

	int gw_bandwidth = atomic_read(&bat_priv->gw_bandwidth);
@@ -420,10 +435,11 @@ static ssize_t show_gw_bwidth(struct kobject *kobj, struct attribute *attr, 
		       (up > 2048 ? "MBit" : "KBit"));

}



static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr,

			       char *buff, size_t count)

static ssize_t batadv_store_gw_bwidth(struct kobject *kobj,

				      struct attribute *attr, char *buff,

				      size_t count)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);



	if (buff[count - 1] == '\n')

		buff[count - 1] = '\0';
@@ -438,36 +454,38 @@ BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); 
#endif

BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);

BAT_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);

static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode);

static BAT_ATTR(routing_algo, S_IRUGO, show_bat_algo, NULL);

static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, show_gw_mode, store_gw_mode);

static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, batadv_show_vis_mode,

		batadv_store_vis_mode);

static BAT_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL);

static BAT_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode,

		batadv_store_gw_mode);

BAT_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * JITTER, INT_MAX, NULL);

BAT_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, TQ_MAX_VALUE, NULL);

BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE,

		  post_gw_deselect);

static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth,

		store_gw_bwidth);

		  batadv_post_gw_deselect);

static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth,

		batadv_store_gw_bwidth);

#ifdef CONFIG_BATMAN_ADV_DEBUG

BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, DBG_ALL, NULL);

#endif



static struct bat_attribute *mesh_attrs[] = {

	&bat_attr_aggregated_ogms,

	&bat_attr_bonding,

static struct bat_attribute *batadv_mesh_attrs[] = {

	&batadv_attr_aggregated_ogms,

	&batadv_attr_bonding,

#ifdef CONFIG_BATMAN_ADV_BLA

	&bat_attr_bridge_loop_avoidance,

	&batadv_attr_bridge_loop_avoidance,

#endif

	&bat_attr_fragmentation,

	&bat_attr_ap_isolation,

	&bat_attr_vis_mode,

	&bat_attr_routing_algo,

	&bat_attr_gw_mode,

	&bat_attr_orig_interval,

	&bat_attr_hop_penalty,

	&bat_attr_gw_sel_class,

	&bat_attr_gw_bandwidth,

	&batadv_attr_fragmentation,

	&batadv_attr_ap_isolation,

	&batadv_attr_vis_mode,

	&batadv_attr_routing_algo,

	&batadv_attr_gw_mode,

	&batadv_attr_orig_interval,

	&batadv_attr_hop_penalty,

	&batadv_attr_gw_sel_class,

	&batadv_attr_gw_bandwidth,

#ifdef CONFIG_BATMAN_ADV_DEBUG

	&bat_attr_log_level,

	&batadv_attr_log_level,

#endif

	NULL,

};
@@ -487,7 +505,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev) 
		goto out;

	}



	for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr) {

	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr) {

		err = sysfs_create_file(bat_priv->mesh_obj,

					&((*bat_attr)->attr));

		if (err) {
@@ -501,7 +519,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev) 
	return 0;



rem_attr:

	for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)

	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)

		sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));



	kobject_put(bat_priv->mesh_obj);
@@ -515,17 +533,17 @@ void batadv_sysfs_del_meshif(struct net_device *dev) 
	struct bat_priv *bat_priv = netdev_priv(dev);

	struct bat_attribute **bat_attr;



	for (bat_attr = mesh_attrs; *bat_attr; ++bat_attr)

	for (bat_attr = batadv_mesh_attrs; *bat_attr; ++bat_attr)

		sysfs_remove_file(bat_priv->mesh_obj, &((*bat_attr)->attr));



	kobject_put(bat_priv->mesh_obj);

	bat_priv->mesh_obj = NULL;

}



static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr,

			       char *buff)

static ssize_t batadv_show_mesh_iface(struct kobject *kobj,

				      struct attribute *attr, char *buff)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	ssize_t length;
@@ -535,15 +553,16 @@ static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr, 
	length = sprintf(buff, "%s\n", hard_iface->if_status == IF_NOT_IN_USE ?

			 "none" : hard_iface->soft_iface->name);



	hardif_free_ref(hard_iface);

	batadv_hardif_free_ref(hard_iface);



	return length;

}



static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr,

				char *buff, size_t count)

static ssize_t batadv_store_mesh_iface(struct kobject *kobj,

				       struct attribute *attr, char *buff,

				       size_t count)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	int status_tmp = -1;

	int ret = count;
@@ -557,7 +576,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, 
	if (strlen(buff) >= IFNAMSIZ) {

		pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",

		       buff);

		hardif_free_ref(hard_iface);

		batadv_hardif_free_ref(hard_iface);

		return -EINVAL;

	}
@@ -592,14 +611,14 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, 
unlock:

	rtnl_unlock();

out:

	hardif_free_ref(hard_iface);

	batadv_hardif_free_ref(hard_iface);

	return ret;

}



static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr,

				 char *buff)

static ssize_t batadv_show_iface_status(struct kobject *kobj,

					struct attribute *attr, char *buff)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	ssize_t length;
@@ -625,18 +644,18 @@ static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr, 
		break;

	}



	hardif_free_ref(hard_iface);

	batadv_hardif_free_ref(hard_iface);



	return length;

}



static BAT_ATTR(mesh_iface, S_IRUGO | S_IWUSR,

		show_mesh_iface, store_mesh_iface);

static BAT_ATTR(iface_status, S_IRUGO, show_iface_status, NULL);

		batadv_show_mesh_iface, batadv_store_mesh_iface);

static BAT_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);



static struct bat_attribute *batman_attrs[] = {

	&bat_attr_mesh_iface,

	&bat_attr_iface_status,

static struct bat_attribute *batadv_batman_attrs[] = {

	&batadv_attr_mesh_iface,

	&batadv_attr_iface_status,

	NULL,

};
@@ -655,7 +674,7 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) 
		goto out;

	}



	for (bat_attr = batman_attrs; *bat_attr; ++bat_attr) {

	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {

		err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));

		if (err) {

			bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",
@@ -668,7 +687,7 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) 
	return 0;



rem_attr:

	for (bat_attr = batman_attrs; *bat_attr; ++bat_attr)

	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr)

		sysfs_remove_file(*hardif_obj, &((*bat_attr)->attr));

out:

	return -ENOMEM;
@@ -688,27 +707,28 @@ int batadv_throw_uevent(struct bat_priv *bat_priv, enum uev_type type, 
	struct kobject *bat_kobj;

	char *uevent_env[4] = { NULL, NULL, NULL, NULL };



	primary_if = primary_if_get_selected(bat_priv);

	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if)

		goto out;



	bat_kobj = &primary_if->soft_iface->dev.kobj;



	uevent_env[0] = kmalloc(strlen(UEV_TYPE_VAR) +

				strlen(uev_type_str[type]) + 1,

				strlen(batadv_uev_type_str[type]) + 1,

				GFP_ATOMIC);

	if (!uevent_env[0])

		goto out;



	sprintf(uevent_env[0], "%s%s", UEV_TYPE_VAR, uev_type_str[type]);

	sprintf(uevent_env[0], "%s%s", UEV_TYPE_VAR, batadv_uev_type_str[type]);



	uevent_env[1] = kmalloc(strlen(UEV_ACTION_VAR) +

				strlen(uev_action_str[action]) + 1,

				strlen(batadv_uev_action_str[action]) + 1,

				GFP_ATOMIC);

	if (!uevent_env[1])

		goto out;



	sprintf(uevent_env[1], "%s%s", UEV_ACTION_VAR, uev_action_str[action]);

	sprintf(uevent_env[1], "%s%s", UEV_ACTION_VAR,

		batadv_uev_action_str[action]);



	/* If the event is DEL, ignore the data field */

	if (action != UEV_DEL) {
@@ -727,12 +747,13 @@ int batadv_throw_uevent(struct bat_priv *bat_priv, enum uev_type type, 
	kfree(uevent_env[2]);



	if (primary_if)

		hardif_free_ref(primary_if);

		batadv_hardif_free_ref(primary_if);



	if (ret)

		bat_dbg(DBG_BATMAN, bat_priv,

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n",

			uev_type_str[type], uev_action_str[action],

			   batadv_uev_type_str[type],

			   batadv_uev_action_str[action],

			   (action == UEV_DEL ? "NULL" : data), ret);

	return ret;

}

net/batman-adv/bitarray.c

+9 −9
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, 
	 */

	if ((seq_num_diff <= 0) && (seq_num_diff > -TQ_LOCAL_WINDOW_SIZE)) {

		if (set_mark)

			bat_set_bit(seq_bits, -seq_num_diff);

			batadv_set_bit(seq_bits, -seq_num_diff);

		return 0;

	}
@@ -59,19 +59,19 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, 
		batadv_bitmap_shift_left(seq_bits, seq_num_diff);



		if (set_mark)

			bat_set_bit(seq_bits, 0);

			batadv_set_bit(seq_bits, 0);

		return 1;

	}



	/* sequence number is much newer, probably missed a lot of packets */

	if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) &&

	    (seq_num_diff < EXPECTED_SEQNO_RANGE)) {

		bat_dbg(DBG_BATMAN, bat_priv,

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "We missed a lot of packets (%i) !\n",

			   seq_num_diff - 1);

		bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);

		if (set_mark)

			bat_set_bit(seq_bits, 0);

			batadv_set_bit(seq_bits, 0);

		return 1;

	}
@@ -83,12 +83,12 @@ int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, 
	if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) ||

	    (seq_num_diff >= EXPECTED_SEQNO_RANGE)) {



		bat_dbg(DBG_BATMAN, bat_priv,

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Other host probably restarted!\n");



		bitmap_zero(seq_bits, TQ_LOCAL_WINDOW_SIZE);

		if (set_mark)

			bat_set_bit(seq_bits, 0);

			batadv_set_bit(seq_bits, 0);



		return 1;

	}

net/batman-adv/bitarray.h

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/* returns true if the corresponding bit in the given seq_bits indicates true

 * and curr_seqno is within range of last_seqno

 */

static inline int bat_test_bit(const unsigned long *seq_bits,

static inline int batadv_test_bit(const unsigned long *seq_bits,

				  uint32_t last_seqno, uint32_t curr_seqno)

{

	int32_t diff;
@@ -36,7 +36,7 @@ static inline int bat_test_bit(const unsigned long *seq_bits, 
}



/* turn corresponding bit on, so we can remember that we got the packet */

static inline void bat_set_bit(unsigned long *seq_bits, int32_t n)

static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)

{

	/* if too old, just drop it */

	if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE)