Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (e8abbe0d) · Commits · 戴 / test

net/batman-adv/bat_iv_ogm.c

+23 −34

Original line number	Diff line number	Diff line
		@@ -132,8 +132,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet,
		"Sending own" :
		"Forwarding"));
		bat_dbg(DBG_BATMAN, bat_priv,
		"%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d,"
		" IDF %s, ttvn %d) on interface %s [%pM]\n",
		"%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",
		fwd_str, (packet_num > 0 ? "aggregated " : ""),
		batman_ogm_packet->orig,
		ntohl(batman_ogm_packet->seqno),
		@@ -171,8 +170,7 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)
		directlink = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);

		if (!forw_packet->if_incoming) {
		pr_err("Error - can't forward packet: incoming iface not "
		"specified\n");
		pr_err("Error - can't forward packet: incoming iface not specified\n");
		goto out;
		}

		@@ -193,8 +191,7 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)

		/* FIXME: what about aggregated packets ? */
		bat_dbg(DBG_BATMAN, bat_priv,
		"%s packet (originator %pM, seqno %d, TTL %d) "
		"on interface %s [%pM]\n",
		"%s packet (originator %pM, seqno %d, TTL %d) on interface %s [%pM]\n",
		(forw_packet->own ? "Sending own" : "Forwarding"),
		batman_ogm_packet->orig,
		ntohl(batman_ogm_packet->seqno),
		@@ -508,8 +505,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node,
		batman_ogm_packet->tq = hop_penalty(batman_ogm_packet->tq, bat_priv);

		bat_dbg(DBG_BATMAN, bat_priv,
		"Forwarding packet: tq_orig: %i, tq_avg: %i, "
		"tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n",
		"Forwarding packet: tq_orig: %i, tq_avg: %i, tq_forw: %i, ttl_orig: %i, ttl_forw: %i\n",
		in_tq, tq_avg, batman_ogm_packet->tq, in_ttl - 1,
		batman_ogm_packet->header.ttl);

		@@ -589,8 +585,8 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv,
		struct hlist_node *node;
		uint8_t bcast_own_sum_orig, bcast_own_sum_neigh;

		bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): "
		"Searching and updating originator entry of received packet\n");
		bat_dbg(DBG_BATMAN, bat_priv,
		"update_originator(): Searching and updating originator entry of received packet\n");

		rcu_read_lock();
		hlist_for_each_entry_rcu(tmp_neigh_node, node,
		@@ -783,8 +779,7 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
		* information */
		tq_own = (TQ_MAX_VALUE * total_count) / neigh_rq_count;

		/*
		* 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does
		/* 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE this does
		* affect the nearly-symmetric links only a little, but
		* punishes asymmetric links more. This will give a value
		* between 0 and TQ_MAX_VALUE
		@@ -802,10 +797,7 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node,
		(TQ_MAX_VALUE * TQ_MAX_VALUE));

		bat_dbg(DBG_BATMAN, bat_priv,
		"bidirectional: "
		"orig = %-15pM neigh = %-15pM => own_bcast = %2i, "
		"real recv = %2i, local tq: %3i, asym_penalty: %3i, "
		"total tq: %3i\n",
		"bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i\n",
		orig_node->orig, orig_neigh_node->orig, total_count,
		neigh_rq_count, tq_own, tq_asym_penalty, batman_ogm_packet->tq);

		@@ -933,9 +925,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
		batman_ogm_packet->orig) ? 1 : 0);

		bat_dbg(DBG_BATMAN, bat_priv,
		"Received BATMAN packet via NB: %pM, IF: %s [%pM] "
		"(from OG: %pM, via prev OG: %pM, seqno %d, ttvn %u, "
		"crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
		"Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %d, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",
		ethhdr->h_source, if_incoming->net_dev->name,
		if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,
		batman_ogm_packet->prev_sender, batman_ogm_packet->seqno,
		@@ -978,16 +968,15 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,

		if (is_my_addr) {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: received my own broadcast (sender: %pM"
		")\n",
		"Drop packet: received my own broadcast (sender: %pM)\n",
		ethhdr->h_source);
		return;
		}

		if (is_broadcast) {
		bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
		"ignoring all packets with broadcast source addr (sender: %pM"
		")\n", ethhdr->h_source);
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n",
		ethhdr->h_source);
		return;
		}

		@@ -1017,16 +1006,16 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
		spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock);
		}

		bat_dbg(DBG_BATMAN, bat_priv, "Drop packet: "
		"originator packet from myself (via neighbor)\n");
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: originator packet from myself (via neighbor)\n");
		orig_node_free_ref(orig_neigh_node);
		return;
		}

		if (is_my_oldorig) {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: ignoring all rebroadcast echos (sender: "
		"%pM)\n", ethhdr->h_source);
		"Drop packet: ignoring all rebroadcast echos (sender: %pM)\n",
		ethhdr->h_source);
		return;
		}

		@@ -1039,8 +1028,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,

		if (is_duplicate == -1) {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: packet within seqno protection time "
		"(sender: %pM)\n", ethhdr->h_source);
		"Drop packet: packet within seqno protection time (sender: %pM)\n",
		ethhdr->h_source);
		goto out;
		}

		@@ -1061,8 +1050,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
		batman_ogm_packet->prev_sender)) &&
		(compare_eth(router->addr, router_router->addr))) {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Drop packet: ignoring all rebroadcast packets that "
		"may make me loop (sender: %pM)\n", ethhdr->h_source);
		"Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %pM)\n",
		ethhdr->h_source);
		goto out;
		}

		@@ -1106,8 +1095,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,
		bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,
		1, if_incoming);

		bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: "
		"rebroadcast neighbor packet with direct link flag\n");
		bat_dbg(DBG_BATMAN, bat_priv,
		"Forwarding packet: rebroadcast neighbor packet with direct link flag\n");
		goto out_neigh;
		}

net/batman-adv/bat_sysfs.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -255,8 +255,8 @@ static ssize_t store_vis_mode(struct kobject kobj, struct attribute attr,
		buff[count - 1] = '\0';

		bat_info(net_dev,
		"Invalid parameter for 'vis mode' setting received: "
		"%s\n", buff);
		"Invalid parameter for 'vis mode' setting received: %s\n",
		buff);
		return -EINVAL;
		}

		@@ -330,8 +330,8 @@ static ssize_t store_gw_mode(struct kobject kobj, struct attribute attr,

		if (gw_mode_tmp < 0) {
		bat_info(net_dev,
		"Invalid parameter for 'gw mode' setting received: "
		"%s\n", buff);
		"Invalid parameter for 'gw mode' setting received: %s\n",
		buff);
		return -EINVAL;
		}

		@@ -502,8 +502,8 @@ static ssize_t store_mesh_iface(struct kobject kobj, struct attribute attr,
		buff[count - 1] = '\0';

		if (strlen(buff) >= IFNAMSIZ) {
		pr_err("Invalid parameter for 'mesh_iface' setting received: "
		"interface name too long '%s'\n", buff);
		pr_err("Invalid parameter for 'mesh_iface' setting received: interface name too long '%s'\n",
		buff);
		hardif_free_ref(hard_iface);
		return -EINVAL;
		}
		@@ -677,8 +677,8 @@ out:
		hardif_free_ref(primary_if);

		if (ret)
		bat_dbg(DBG_BATMAN, bat_priv, "Impossible to send "
		"uevent for (%s,%s,%s) event (err: %d)\n",
		bat_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],
		(action == UEV_DEL ? "NULL" : data), ret);
		return ret;

net/batman-adv/gateway_client.c

+13 −18

Original line number	Diff line number	Diff line
		@@ -224,16 +224,13 @@ void gw_election(struct bat_priv *bat_priv)
		} else if ((!curr_gw) && (next_gw)) {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Adding route to gateway %pM (gw_flags: %i, tq: %i)\n",
		next_gw->orig_node->orig,
		next_gw->orig_node->gw_flags,
		next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
		router->tq_avg);
		throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
		} else {
		bat_dbg(DBG_BATMAN, bat_priv,
		"Changing route to gateway %pM "
		"(gw_flags: %i, tq: %i)\n",
		next_gw->orig_node->orig,
		next_gw->orig_node->gw_flags,
		"Changing route to gateway %pM (gw_flags: %i, tq: %i)\n",
		next_gw->orig_node->orig, next_gw->orig_node->gw_flags,
		router->tq_avg);
		throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
		}
		@@ -287,8 +284,7 @@ void gw_check_election(struct bat_priv bat_priv, struct orig_node orig_node)
		goto out;

		bat_dbg(DBG_BATMAN, bat_priv,
		"Restarting gateway selection: better gateway found (tq curr: "
		"%i, tq new: %i)\n",
		"Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n",
		gw_tq_avg, orig_tq_avg);

		deselect:
		@@ -352,8 +348,7 @@ void gw_node_update(struct bat_priv *bat_priv,
		continue;

		bat_dbg(DBG_BATMAN, bat_priv,
		"Gateway class of originator %pM changed from "
		"%i to %i\n",
		"Gateway class of originator %pM changed from %i to %i\n",
		orig_node->orig, gw_node->orig_node->gw_flags,
		new_gwflags);

		@@ -474,23 +469,23 @@ int gw_client_seq_print_text(struct seq_file seq, void offset)

		primary_if = primary_if_get_selected(bat_priv);
		if (!primary_if) {
		ret = seq_printf(seq, "BATMAN mesh %s disabled - please "
		"specify interfaces to enable it\n",
		ret = seq_printf(seq,
		"BATMAN mesh %s disabled - please specify interfaces to enable it\n",
		net_dev->name);
		goto out;
		}

		if (primary_if->if_status != IF_ACTIVE) {
		ret = seq_printf(seq, "BATMAN mesh %s disabled - "
		"primary interface not active\n",
		ret = seq_printf(seq,
		"BATMAN mesh %s disabled - primary interface not active\n",
		net_dev->name);
		goto out;
		}

		seq_printf(seq, " %-12s (%s/%i) %17s [%10s]: gw_class ... "
		"[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
		"Gateway", "#", TQ_MAX_VALUE, "Nexthop",
		"outgoingIF", SOURCE_VERSION, primary_if->net_dev->name,
		seq_printf(seq,
		" %-12s (%s/%i) %17s [%10s]: gw_class ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
		"Gateway", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
		SOURCE_VERSION, primary_if->net_dev->name,
		primary_if->net_dev->dev_addr, net_dev->name);

		rcu_read_lock();

net/batman-adv/gateway_common.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -125,8 +125,8 @@ static bool parse_gw_bandwidth(struct net_device net_dev, char buff,
		ret = kstrtol(slash_ptr + 1, 10, &lup);
		if (ret) {
		bat_err(net_dev,
		"Upload speed of gateway mode invalid: "
		"%s\n", slash_ptr + 1);
		"Upload speed of gateway mode invalid: %s\n",
		slash_ptr + 1);
		return false;
		}

		@@ -163,8 +163,8 @@ ssize_t gw_bandwidth_set(struct net_device net_dev, char buff, size_t count)
		gw_bandwidth_to_kbit((uint8_t)gw_bandwidth_tmp, &down, &up);

		gw_deselect(bat_priv);
		bat_info(net_dev, "Changing gateway bandwidth from: '%i' to: '%ld' "
		"(propagating: %d%s/%d%s)\n",
		bat_info(net_dev,
		"Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",
		atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,
		(down > 2048 ? down / 1024 : down),
		(down > 2048 ? "MBit" : "KBit"),

net/batman-adv/hard-interface.c

+12 −24

Original line number	Diff line number	Diff line
		@@ -175,11 +175,9 @@ static void check_known_mac_addr(const struct net_device *net_dev)
		net_dev->dev_addr))
		continue;

		pr_warning("The newly added mac address (%pM) already exists "
		"on: %s\n", net_dev->dev_addr,
		hard_iface->net_dev->name);
		pr_warning("It is strongly recommended to keep mac addresses "
		"unique to avoid problems!\n");
		pr_warning("The newly added mac address (%pM) already exists on: %s\n",
		net_dev->dev_addr, hard_iface->net_dev->name);
		pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n");
		}
		rcu_read_unlock();
		}
		@@ -282,10 +280,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,

		/* hard-interface is part of a bridge */
		if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT)
		pr_err("You are about to enable batman-adv on '%s' which "
		"already is part of a bridge. Unless you know exactly "
		"what you are doing this is probably wrong and won't "
		"work the way you think it would.\n",
		pr_err("You are about to enable batman-adv on '%s' which already is part of a bridge. Unless you know exactly what you are doing this is probably wrong and won't work the way you think it would.\n",
		hard_iface->net_dev->name);

		soft_iface = dev_get_by_name(&init_net, iface_name);
		@@ -303,8 +298,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
		}

		if (!softif_is_valid(soft_iface)) {
		pr_err("Can't create batman mesh interface %s: "
		"already exists as regular interface\n",
		pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",
		soft_iface->name);
		dev_put(soft_iface);
		ret = -EINVAL;
		@@ -317,8 +311,9 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
		bat_priv->bat_algo_ops->bat_ogm_init(hard_iface);

		if (!hard_iface->packet_buff) {
		bat_err(hard_iface->soft_iface, "Can't add interface packet "
		"(%s): out of memory\n", hard_iface->net_dev->name);
		bat_err(hard_iface->soft_iface,
		"Can't add interface packet (%s): out of memory\n",
		hard_iface->net_dev->name);
		ret = -ENOMEM;
		goto err;
		}
		@@ -341,29 +336,22 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
		if (atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
		ETH_DATA_LEN + BAT_HEADER_LEN)
		bat_info(hard_iface->soft_iface,
		"The MTU of interface %s is too small (%i) to handle "
		"the transport of batman-adv packets. Packets going "
		"over this interface will be fragmented on layer2 "
		"which could impact the performance. Setting the MTU "
		"to %zi would solve the problem.\n",
		"The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n",
		hard_iface->net_dev->name, hard_iface->net_dev->mtu,
		ETH_DATA_LEN + BAT_HEADER_LEN);

		if (!atomic_read(&bat_priv->fragmentation) && hard_iface->net_dev->mtu <
		ETH_DATA_LEN + BAT_HEADER_LEN)
		bat_info(hard_iface->soft_iface,
		"The MTU of interface %s is too small (%i) to handle "
		"the transport of batman-adv packets. If you "
		"experience problems getting traffic through try "
		"increasing the MTU to %zi.\n",
		"The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n",
		hard_iface->net_dev->name, hard_iface->net_dev->mtu,
		ETH_DATA_LEN + BAT_HEADER_LEN);

		if (hardif_is_iface_up(hard_iface))
		hardif_activate_interface(hard_iface);
		else
		bat_err(hard_iface->soft_iface, "Not using interface %s "
		"(retrying later): interface not active\n",
		bat_err(hard_iface->soft_iface,
		"Not using interface %s (retrying later): interface not active\n",
		hard_iface->net_dev->name);

		/* begin scheduling originator messages on that interface */

Admin message