This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich - Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlnXingWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoYfMEACRMbLTKj2qBRlvJJEZczEiViN3 QgiatDtAFxI8VTgINqH2UzqFNd8Tg/4cvdrxpRgJsvIImyRvM0L40ZA+cjot6S/d j1q/DtCjC2qXcdt0GF5qo+5/mIcPTERp7r8vLD8tT6raq9E/D8lfPLXEc5XD/ZIq 1m0WWLebDpmTWYduZYMhH7k8kdYSGXt84bkjT7RTs5C7gRRJFJcx/3wpfz9xO6K1 +rnS6A+f5EqA9BA8lgDLsFY3NOAmCx/7DXnTMpWaD5ecpNI0qrtsYmEmw5pBOryK 6UJ5AE4XYPTC1kpsGdKrf4lk2nz+k77CRkbec4O7zxYmLpJpqHz6HkWOgryHdf3Y lrhG/oR3XGa1gq0PaL4z0W7id1+Ur1ACNtikH5rIZff06Bgvh8RA3RrQMV42S0os fL35cjGTysxrHzyEJmy90g1AXRkZSBupZ1+/Owe9r0HoRJAJv/TfB1yBfjgXoL55 HEJ3BAFLyEGMiQtWawVkGJw0oqgNLX13K89Va4ZLZodSCf4BZfXCoZnvCINauKTd daNzIRdvvHoMKj7rPl5VGXhRKtO8lxmz12b2CC0boInmwcKLZmVowbZcj3zkES95 jZxXkRanXWEfXGC7aPA2N9rCPcakH2l928gnG3xcVBeXaPAg0zL4ZpxUuo76aP2A AgjVUeZL4LYojmaZfQ== =7hcv -----END PGP SIGNATURE----- Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
4bc4e64c2c
|
@ -916,8 +916,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
|
|||
u16 tvlv_len = 0;
|
||||
unsigned long send_time;
|
||||
|
||||
if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
|
||||
(hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
|
||||
if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||
|
||||
hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)
|
||||
return;
|
||||
|
||||
/* the interface gets activated here to avoid race conditions between
|
||||
|
@ -1264,7 +1264,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
|
|||
* drops as they can't send and receive at the same time.
|
||||
*/
|
||||
tq_iface_penalty = BATADV_TQ_MAX_VALUE;
|
||||
if (if_outgoing && (if_incoming == if_outgoing) &&
|
||||
if (if_outgoing && if_incoming == if_outgoing &&
|
||||
batadv_is_wifi_hardif(if_outgoing))
|
||||
tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE,
|
||||
bat_priv);
|
||||
|
@ -1369,7 +1369,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
|
|||
ret = BATADV_NEIGH_DUP;
|
||||
} else {
|
||||
set_mark = 0;
|
||||
if (is_dup && (ret != BATADV_NEIGH_DUP))
|
||||
if (is_dup && ret != BATADV_NEIGH_DUP)
|
||||
ret = BATADV_ORIG_DUP;
|
||||
}
|
||||
|
||||
|
@ -1515,7 +1515,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
|
|||
/* drop packet if sender is not a direct neighbor and if we
|
||||
* don't route towards it
|
||||
*/
|
||||
if (!is_single_hop_neigh && (!orig_neigh_router)) {
|
||||
if (!is_single_hop_neigh && !orig_neigh_router) {
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
"Drop packet: OGM via unknown neighbor!\n");
|
||||
goto out_neigh;
|
||||
|
@ -1535,7 +1535,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
|
|||
sameseq = orig_ifinfo->last_real_seqno == ntohl(ogm_packet->seqno);
|
||||
similar_ttl = (orig_ifinfo->last_ttl - 3) <= ogm_packet->ttl;
|
||||
|
||||
if (is_bidirect && ((dup_status == BATADV_NO_DUP) ||
|
||||
if (is_bidirect && (dup_status == BATADV_NO_DUP ||
|
||||
(sameseq && similar_ttl))) {
|
||||
batadv_iv_ogm_orig_update(bat_priv, orig_node,
|
||||
orig_ifinfo, ethhdr,
|
||||
|
@ -1553,8 +1553,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
|
|||
/* OGMs from secondary interfaces should only scheduled once
|
||||
* per interface where it has been received, not multiple times
|
||||
*/
|
||||
if ((ogm_packet->ttl <= 2) &&
|
||||
(if_incoming != if_outgoing)) {
|
||||
if (ogm_packet->ttl <= 2 &&
|
||||
if_incoming != if_outgoing) {
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
"Drop packet: OGM from secondary interface and wrong outgoing interface\n");
|
||||
goto out_neigh;
|
||||
|
@ -1590,7 +1590,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
|
|||
if_incoming, if_outgoing);
|
||||
|
||||
out_neigh:
|
||||
if ((orig_neigh_node) && (!is_single_hop_neigh))
|
||||
if (orig_neigh_node && !is_single_hop_neigh)
|
||||
batadv_orig_node_put(orig_neigh_node);
|
||||
out:
|
||||
if (router_ifinfo)
|
||||
|
@ -2523,9 +2523,9 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
|
|||
tmp_gw_factor *= 100 * 100;
|
||||
tmp_gw_factor >>= 18;
|
||||
|
||||
if ((tmp_gw_factor > max_gw_factor) ||
|
||||
((tmp_gw_factor == max_gw_factor) &&
|
||||
(tq_avg > max_tq))) {
|
||||
if (tmp_gw_factor > max_gw_factor ||
|
||||
(tmp_gw_factor == max_gw_factor &&
|
||||
tq_avg > max_tq)) {
|
||||
if (curr_gw)
|
||||
batadv_gw_node_put(curr_gw);
|
||||
curr_gw = gw_node;
|
||||
|
|
|
@ -767,7 +767,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv)
|
|||
if (batadv_v_gw_throughput_get(gw_node, &bw) < 0)
|
||||
goto next;
|
||||
|
||||
if (curr_gw && (bw <= max_bw))
|
||||
if (curr_gw && bw <= max_bw)
|
||||
goto next;
|
||||
|
||||
if (curr_gw)
|
||||
|
|
|
@ -134,7 +134,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
|
|||
hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX;
|
||||
|
||||
throughput = link_settings.base.speed;
|
||||
if (throughput && (throughput != SPEED_UNKNOWN))
|
||||
if (throughput && throughput != SPEED_UNKNOWN)
|
||||
return throughput * 10;
|
||||
}
|
||||
|
||||
|
@ -263,8 +263,8 @@ static void batadv_v_elp_periodic_work(struct work_struct *work)
|
|||
goto out;
|
||||
|
||||
/* we are in the process of shutting this interface down */
|
||||
if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
|
||||
(hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
|
||||
if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||
|
||||
hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)
|
||||
goto out;
|
||||
|
||||
/* the interface was enabled but may not be ready yet */
|
||||
|
|
|
@ -304,8 +304,8 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv,
|
|||
* due to the store & forward characteristics of WIFI.
|
||||
* Very low throughput values are the exception.
|
||||
*/
|
||||
if ((throughput > 10) &&
|
||||
(if_incoming == if_outgoing) &&
|
||||
if (throughput > 10 &&
|
||||
if_incoming == if_outgoing &&
|
||||
!(if_incoming->bat_v.flags & BATADV_FULL_DUPLEX))
|
||||
return throughput / 2;
|
||||
|
||||
|
@ -455,7 +455,7 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv,
|
|||
/* drop packets with old seqnos, however accept the first packet after
|
||||
* a host has been rebooted.
|
||||
*/
|
||||
if ((seq_diff < 0) && !protection_started)
|
||||
if (seq_diff < 0 && !protection_started)
|
||||
goto out;
|
||||
|
||||
neigh_node->last_seen = jiffies;
|
||||
|
@ -568,8 +568,8 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,
|
|||
router_throughput = router_ifinfo->bat_v.throughput;
|
||||
neigh_throughput = neigh_ifinfo->bat_v.throughput;
|
||||
|
||||
if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) &&
|
||||
(router_throughput >= neigh_throughput))
|
||||
if (neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF &&
|
||||
router_throughput >= neigh_throughput)
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -621,7 +621,7 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,
|
|||
return;
|
||||
|
||||
/* only unknown & newer OGMs contain TVLVs we are interested in */
|
||||
if ((seqno_age > 0) && (if_outgoing == BATADV_IF_DEFAULT))
|
||||
if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT)
|
||||
batadv_tvlv_containers_process(bat_priv, true, orig_node,
|
||||
NULL, NULL,
|
||||
(unsigned char *)(ogm2 + 1),
|
||||
|
|
|
@ -492,8 +492,8 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
|
|||
/* this is an hash collision with the temporary selected node. Choose
|
||||
* the one with the lowest address
|
||||
*/
|
||||
if ((tmp_max == max) && max_orig_node &&
|
||||
(batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0))
|
||||
if (tmp_max == max && max_orig_node &&
|
||||
batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0)
|
||||
goto out;
|
||||
|
||||
ret = true;
|
||||
|
|
|
@ -248,12 +248,12 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
|
|||
}
|
||||
}
|
||||
|
||||
if ((curr_gw) && (!next_gw)) {
|
||||
if (curr_gw && !next_gw) {
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
"Removing selected gateway - no gateway in range\n");
|
||||
batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL,
|
||||
NULL);
|
||||
} else if ((!curr_gw) && (next_gw)) {
|
||||
} else if (!curr_gw && next_gw) {
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
"Adding route to gateway %pM (bandwidth: %u.%u/%u.%u MBit, tq: %i)\n",
|
||||
next_gw->orig_node->orig,
|
||||
|
@ -411,8 +411,8 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
|
|||
goto out;
|
||||
}
|
||||
|
||||
if ((gw_node->bandwidth_down == ntohl(gateway->bandwidth_down)) &&
|
||||
(gw_node->bandwidth_up == ntohl(gateway->bandwidth_up)))
|
||||
if (gw_node->bandwidth_down == ntohl(gateway->bandwidth_down) &&
|
||||
gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))
|
||||
goto out;
|
||||
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
|
|
|
@ -56,8 +56,8 @@ bool batadv_parse_throughput(struct net_device *net_dev, char *buff,
|
|||
if (strncasecmp(tmp_ptr, "mbit", 4) == 0)
|
||||
bw_unit_type = BATADV_BW_UNIT_MBIT;
|
||||
|
||||
if ((strncasecmp(tmp_ptr, "kbit", 4) == 0) ||
|
||||
(bw_unit_type == BATADV_BW_UNIT_MBIT))
|
||||
if (strncasecmp(tmp_ptr, "kbit", 4) == 0 ||
|
||||
bw_unit_type == BATADV_BW_UNIT_MBIT)
|
||||
*tmp_ptr = '\0';
|
||||
}
|
||||
|
||||
|
@ -190,7 +190,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
|
|||
if (!up_new)
|
||||
up_new = 1;
|
||||
|
||||
if ((down_curr == down_new) && (up_curr == up_new))
|
||||
if (down_curr == down_new && up_curr == up_new)
|
||||
return count;
|
||||
|
||||
batadv_gw_reselect(bat_priv);
|
||||
|
@ -224,16 +224,16 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
|
|||
/* only fetch the tvlv value if the handler wasn't called via the
|
||||
* CIFNOTFND flag and if there is data to fetch
|
||||
*/
|
||||
if ((flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND) ||
|
||||
(tvlv_value_len < sizeof(gateway))) {
|
||||
if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND ||
|
||||
tvlv_value_len < sizeof(gateway)) {
|
||||
gateway.bandwidth_down = 0;
|
||||
gateway.bandwidth_up = 0;
|
||||
} else {
|
||||
gateway_ptr = tvlv_value;
|
||||
gateway.bandwidth_down = gateway_ptr->bandwidth_down;
|
||||
gateway.bandwidth_up = gateway_ptr->bandwidth_up;
|
||||
if ((gateway.bandwidth_down == 0) ||
|
||||
(gateway.bandwidth_up == 0)) {
|
||||
if (gateway.bandwidth_down == 0 ||
|
||||
gateway.bandwidth_up == 0) {
|
||||
gateway.bandwidth_down = 0;
|
||||
gateway.bandwidth_up = 0;
|
||||
}
|
||||
|
@ -242,8 +242,8 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
|
|||
batadv_gw_node_update(bat_priv, orig, &gateway);
|
||||
|
||||
/* restart gateway selection */
|
||||
if ((gateway.bandwidth_down != 0) &&
|
||||
(atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT))
|
||||
if (gateway.bandwidth_down != 0 &&
|
||||
atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT)
|
||||
batadv_gw_check_election(bat_priv, orig);
|
||||
}
|
||||
|
||||
|
|
|
@ -504,8 +504,8 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
|
|||
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
|
||||
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
|
||||
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
|
||||
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
|
||||
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
|
||||
continue;
|
||||
|
||||
if (hard_iface->net_dev == net_dev)
|
||||
|
@ -568,8 +568,8 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface)
|
|||
|
||||
rcu_read_lock();
|
||||
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
|
||||
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
|
||||
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
|
||||
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
|
||||
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
|
||||
continue;
|
||||
|
||||
if (hard_iface->soft_iface != soft_iface)
|
||||
|
@ -654,8 +654,8 @@ out:
|
|||
static void
|
||||
batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)
|
||||
{
|
||||
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
|
||||
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
|
||||
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
|
||||
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
|
||||
return;
|
||||
|
||||
hard_iface->if_status = BATADV_IF_INACTIVE;
|
||||
|
|
|
@ -132,10 +132,10 @@ static ssize_t batadv_socket_read(struct file *file, char __user *buf,
|
|||
size_t packet_len;
|
||||
int error;
|
||||
|
||||
if ((file->f_flags & O_NONBLOCK) && (socket_client->queue_len == 0))
|
||||
if ((file->f_flags & O_NONBLOCK) && socket_client->queue_len == 0)
|
||||
return -EAGAIN;
|
||||
|
||||
if ((!buf) || (count < sizeof(struct batadv_icmp_packet)))
|
||||
if (!buf || count < sizeof(struct batadv_icmp_packet))
|
||||
return -EINVAL;
|
||||
|
||||
if (!access_ok(VERIFY_WRITE, buf, count))
|
||||
|
|
|
@ -73,8 +73,8 @@
|
|||
* list traversals just rcu-locked
|
||||
*/
|
||||
struct list_head batadv_hardif_list;
|
||||
static int (*batadv_rx_handler[256])(struct sk_buff *,
|
||||
struct batadv_hard_iface *);
|
||||
static int (*batadv_rx_handler[256])(struct sk_buff *skb,
|
||||
struct batadv_hard_iface *recv_if);
|
||||
|
||||
unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
|
||||
|
@ -540,12 +540,12 @@ batadv_recv_handler_register(u8 packet_type,
|
|||
int (*recv_handler)(struct sk_buff *,
|
||||
struct batadv_hard_iface *))
|
||||
{
|
||||
int (*curr)(struct sk_buff *,
|
||||
struct batadv_hard_iface *);
|
||||
int (*curr)(struct sk_buff *skb,
|
||||
struct batadv_hard_iface *recv_if);
|
||||
curr = batadv_rx_handler[packet_type];
|
||||
|
||||
if ((curr != batadv_recv_unhandled_packet) &&
|
||||
(curr != batadv_recv_unhandled_unicast_packet))
|
||||
if (curr != batadv_recv_unhandled_packet &&
|
||||
curr != batadv_recv_unhandled_unicast_packet)
|
||||
return -EBUSY;
|
||||
|
||||
batadv_rx_handler[packet_type] = recv_handler;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#define BATADV_DRIVER_DEVICE "batman-adv"
|
||||
|
||||
#ifndef BATADV_SOURCE_VERSION
|
||||
#define BATADV_SOURCE_VERSION "2017.3"
|
||||
#define BATADV_SOURCE_VERSION "2017.4"
|
||||
#endif
|
||||
|
||||
/* B.A.T.M.A.N. parameters */
|
||||
|
|
|
@ -1126,7 +1126,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,
|
|||
bool orig_initialized;
|
||||
|
||||
if (orig_mcast_enabled && tvlv_value &&
|
||||
(tvlv_value_len >= sizeof(mcast_flags)))
|
||||
tvlv_value_len >= sizeof(mcast_flags))
|
||||
mcast_flags = *(u8 *)tvlv_value;
|
||||
|
||||
spin_lock_bh(&orig->mcast_handler_lock);
|
||||
|
|
|
@ -1062,9 +1062,9 @@ batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv,
|
|||
continue;
|
||||
|
||||
/* don't purge if the interface is not (going) down */
|
||||
if ((if_outgoing->if_status != BATADV_IF_INACTIVE) &&
|
||||
(if_outgoing->if_status != BATADV_IF_NOT_IN_USE) &&
|
||||
(if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED))
|
||||
if (if_outgoing->if_status != BATADV_IF_INACTIVE &&
|
||||
if_outgoing->if_status != BATADV_IF_NOT_IN_USE &&
|
||||
if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED)
|
||||
continue;
|
||||
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
|
@ -1106,9 +1106,9 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv,
|
|||
continue;
|
||||
|
||||
/* don't purge if the interface is not (going) down */
|
||||
if ((if_outgoing->if_status != BATADV_IF_INACTIVE) &&
|
||||
(if_outgoing->if_status != BATADV_IF_NOT_IN_USE) &&
|
||||
(if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED))
|
||||
if (if_outgoing->if_status != BATADV_IF_INACTIVE &&
|
||||
if_outgoing->if_status != BATADV_IF_NOT_IN_USE &&
|
||||
if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED)
|
||||
continue;
|
||||
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
|
@ -1155,13 +1155,13 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,
|
|||
last_seen = neigh_node->last_seen;
|
||||
if_incoming = neigh_node->if_incoming;
|
||||
|
||||
if ((batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT)) ||
|
||||
(if_incoming->if_status == BATADV_IF_INACTIVE) ||
|
||||
(if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
|
||||
(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) {
|
||||
if ((if_incoming->if_status == BATADV_IF_INACTIVE) ||
|
||||
(if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
|
||||
(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED))
|
||||
if (batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT) ||
|
||||
if_incoming->if_status == BATADV_IF_INACTIVE ||
|
||||
if_incoming->if_status == BATADV_IF_NOT_IN_USE ||
|
||||
if_incoming->if_status == BATADV_IF_TO_BE_REMOVED) {
|
||||
if (if_incoming->if_status == BATADV_IF_INACTIVE ||
|
||||
if_incoming->if_status == BATADV_IF_NOT_IN_USE ||
|
||||
if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)
|
||||
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
|
||||
"neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
|
||||
orig_node->orig, neigh_node->addr,
|
||||
|
|
|
@ -93,14 +93,14 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,
|
|||
batadv_orig_ifinfo_put(orig_ifinfo);
|
||||
|
||||
/* route deleted */
|
||||
if ((curr_router) && (!neigh_node)) {
|
||||
if (curr_router && !neigh_node) {
|
||||
batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
|
||||
"Deleting route towards: %pM\n", orig_node->orig);
|
||||
batadv_tt_global_del_orig(bat_priv, orig_node, -1,
|
||||
"Deleted route towards originator");
|
||||
|
||||
/* route added */
|
||||
} else if ((!curr_router) && (neigh_node)) {
|
||||
} else if (!curr_router && neigh_node) {
|
||||
batadv_dbg(BATADV_DBG_ROUTES, bat_priv,
|
||||
"Adding route towards: %pM (via %pM)\n",
|
||||
orig_node->orig, neigh_node->addr);
|
||||
|
@ -381,7 +381,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
|
|||
/* add record route information if not full */
|
||||
if ((icmph->msg_type == BATADV_ECHO_REPLY ||
|
||||
icmph->msg_type == BATADV_ECHO_REQUEST) &&
|
||||
(skb->len >= sizeof(struct batadv_icmp_packet_rr))) {
|
||||
skb->len >= sizeof(struct batadv_icmp_packet_rr)) {
|
||||
if (skb_linearize(skb) < 0)
|
||||
goto free_skb;
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb,
|
|||
#ifdef CONFIG_BATMAN_ADV_BATMAN_V
|
||||
hardif_neigh = batadv_hardif_neigh_get(neigh->if_incoming, neigh->addr);
|
||||
|
||||
if ((hardif_neigh) && (ret != NET_XMIT_DROP))
|
||||
if (hardif_neigh && ret != NET_XMIT_DROP)
|
||||
hardif_neigh->bat_v.last_unicast_tx = jiffies;
|
||||
|
||||
if (hardif_neigh)
|
||||
|
@ -615,8 +615,8 @@ batadv_forw_packet_list_steal(struct hlist_head *forw_list,
|
|||
* we delete only packets belonging to the given interface
|
||||
*/
|
||||
if (hard_iface &&
|
||||
(forw_packet->if_incoming != hard_iface) &&
|
||||
(forw_packet->if_outgoing != hard_iface))
|
||||
forw_packet->if_incoming != hard_iface &&
|
||||
forw_packet->if_outgoing != hard_iface)
|
||||
continue;
|
||||
|
||||
hlist_del(&forw_packet->list);
|
||||
|
|
|
@ -69,8 +69,8 @@ int batadv_skb_head_push(struct sk_buff *skb, unsigned int len)
|
|||
int result;
|
||||
|
||||
/* TODO: We must check if we can release all references to non-payload
|
||||
* data using __skb_header_release in our skbs to allow skb_cow_header to
|
||||
* work optimally. This means that those skbs are not allowed to read
|
||||
* data using __skb_header_release in our skbs to allow skb_cow_header
|
||||
* to work optimally. This means that those skbs are not allowed to read
|
||||
* or write any data which is before the current position of skb->data
|
||||
* after that call and thus allow other skbs with the same data buffer
|
||||
* to write freely in that area.
|
||||
|
@ -160,7 +160,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)
|
|||
static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
/* check ranges */
|
||||
if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))
|
||||
if (new_mtu < 68 || new_mtu > batadv_hardif_min_mtu(dev))
|
||||
return -EINVAL;
|
||||
|
||||
dev->mtu = new_mtu;
|
||||
|
|
|
@ -925,8 +925,8 @@ static int batadv_store_mesh_iface_finish(struct net_device *net_dev,
|
|||
if (hard_iface->if_status == status_tmp)
|
||||
goto out;
|
||||
|
||||
if ((hard_iface->soft_iface) &&
|
||||
(strncmp(hard_iface->soft_iface->name, ifname, IFNAMSIZ) == 0))
|
||||
if (hard_iface->soft_iface &&
|
||||
strncmp(hard_iface->soft_iface->name, ifname, IFNAMSIZ) == 0)
|
||||
goto out;
|
||||
|
||||
if (status_tmp == BATADV_IF_NOT_IN_USE) {
|
||||
|
|
|
@ -1206,7 +1206,7 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst,
|
|||
|
||||
/* send the ack */
|
||||
r = batadv_send_skb_to_orig(skb, orig_node, NULL);
|
||||
if (unlikely(r < 0) || (r == NET_XMIT_DROP)) {
|
||||
if (unlikely(r < 0) || r == NET_XMIT_DROP) {
|
||||
ret = BATADV_TP_REASON_DST_UNREACHABLE;
|
||||
goto out;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue