Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6018e118 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

parents 075cd29e ecbd5321

net/batman-adv/aggregation.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void new_aggregated_packet(const unsigned char *packet_buff, 
	forw_packet_aggr->own = own_packet;

	forw_packet_aggr->if_incoming = if_incoming;

	forw_packet_aggr->num_packets = 0;

	forw_packet_aggr->direct_link_flags = 0;

	forw_packet_aggr->direct_link_flags = NO_FLAGS;

	forw_packet_aggr->send_time = send_time;



	/* save packet direct link flag status */

net/batman-adv/bat_sysfs.c

+11 −3
Original line number Diff line number Diff line
@@ -28,9 +28,17 @@ 
#include "gateway_client.h"

#include "vis.h"



#define to_dev(obj)		container_of(obj, struct device, kobj)

#define kobj_to_netdev(obj)	to_net_dev(to_dev(obj->parent))

#define kobj_to_batpriv(obj)	netdev_priv(kobj_to_netdev(obj))

static struct net_device *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)

{

	struct net_device *net_dev = kobj_to_netdev(obj);

	return netdev_priv(net_dev);

}



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

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

net/batman-adv/gateway_client.c

+3 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ void gw_node_update(struct bat_priv *bat_priv, 


		gw_node->deleted = 0;



		if (new_gwflags == 0) {

		if (new_gwflags == NO_FLAGS) {

			gw_node->deleted = jiffies;

			bat_dbg(DBG_BATMAN, bat_priv,

				"Gateway %pM removed from gateway list\n",
@@ -335,7 +335,7 @@ void gw_node_update(struct bat_priv *bat_priv, 
		goto unlock;

	}



	if (new_gwflags == 0)

	if (new_gwflags == NO_FLAGS)

		goto unlock;



	gw_node_add(bat_priv, orig_node, new_gwflags);
@@ -352,7 +352,7 @@ unlock: 


void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node)

{

	return gw_node_update(bat_priv, orig_node, 0);

	gw_node_update(bat_priv, orig_node, 0);

}



void gw_node_purge(struct bat_priv *bat_priv)

net/batman-adv/gateway_common.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, 
			*tmp_ptr = '\0';

	}



	ret = strict_strtoul(buff, 10, &ldown);

	ret = strict_strtol(buff, 10, &ldown);

	if (ret) {

		bat_err(net_dev,

			"Download speed of gateway mode invalid: %s\n",
@@ -122,7 +122,7 @@ static bool parse_gw_bandwidth(struct net_device *net_dev, char *buff, 
				*tmp_ptr = '\0';

		}



		ret = strict_strtoul(slash_ptr + 1, 10, &lup);

		ret = strict_strtol(slash_ptr + 1, 10, &lup);

		if (ret) {

			bat_err(net_dev,

				"Upload speed of gateway mode invalid: "

net/batman-adv/hard-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, 
	batman_packet = (struct batman_packet *)(hard_iface->packet_buff);

	batman_packet->packet_type = BAT_PACKET;

	batman_packet->version = COMPAT_VERSION;

	batman_packet->flags = 0;

	batman_packet->flags = NO_FLAGS;

	batman_packet->ttl = 2;

	batman_packet->tq = TQ_MAX_VALUE;

	batman_packet->num_tt = 0;