Skip to content

Commit 4bc4e64

Browse files
davem330davem330
committed
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>
2 parents d2746fe + 706cc9f commit 4bc4e64

18 files changed

+78
-78
lines changed

‎net/batman-adv/bat_iv_ogm.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
916916
u16 tvlv_len = 0;
917917
unsigned long send_time;
918918

919-
if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
920-
(hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
919+
if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||
920+
hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)
921921
return;
922922

923923
/* 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,
12641264
* drops as they can't send and receive at the same time.
12651265
*/
12661266
tq_iface_penalty = BATADV_TQ_MAX_VALUE;
1267-
if (if_outgoing && (if_incoming == if_outgoing) &&
1267+
if (if_outgoing && if_incoming == if_outgoing &&
12681268
batadv_is_wifi_hardif(if_outgoing))
12691269
tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE,
12701270
bat_priv);
@@ -1369,7 +1369,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
13691369
ret = BATADV_NEIGH_DUP;
13701370
} else {
13711371
set_mark = 0;
1372-
if (is_dup && (ret != BATADV_NEIGH_DUP))
1372+
if (is_dup && ret != BATADV_NEIGH_DUP)
13731373
ret = BATADV_ORIG_DUP;
13741374
}
13751375

@@ -1515,7 +1515,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
15151515
/* drop packet if sender is not a direct neighbor and if we
15161516
* don't route towards it
15171517
*/
1518-
if (!is_single_hop_neigh && (!orig_neigh_router)) {
1518+
if (!is_single_hop_neigh && !orig_neigh_router) {
15191519
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
15201520
"Drop packet: OGM via unknown neighbor!\n");
15211521
goto out_neigh;
@@ -1535,7 +1535,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
15351535
sameseq = orig_ifinfo->last_real_seqno == ntohl(ogm_packet->seqno);
15361536
similar_ttl = (orig_ifinfo->last_ttl - 3) <= ogm_packet->ttl;
15371537

1538-
if (is_bidirect && ((dup_status == BATADV_NO_DUP) ||
1538+
if (is_bidirect && (dup_status == BATADV_NO_DUP ||
15391539
(sameseq && similar_ttl))) {
15401540
batadv_iv_ogm_orig_update(bat_priv, orig_node,
15411541
orig_ifinfo, ethhdr,
@@ -1553,8 +1553,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
15531553
/* OGMs from secondary interfaces should only scheduled once
15541554
* per interface where it has been received, not multiple times
15551555
*/
1556-
if ((ogm_packet->ttl <= 2) &&
1557-
(if_incoming != if_outgoing)) {
1556+
if (ogm_packet->ttl <= 2 &&
1557+
if_incoming != if_outgoing) {
15581558
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
15591559
"Drop packet: OGM from secondary interface and wrong outgoing interface\n");
15601560
goto out_neigh;
@@ -1590,7 +1590,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,
15901590
if_incoming, if_outgoing);
15911591

15921592
out_neigh:
1593-
if ((orig_neigh_node) && (!is_single_hop_neigh))
1593+
if (orig_neigh_node && !is_single_hop_neigh)
15941594
batadv_orig_node_put(orig_neigh_node);
15951595
out:
15961596
if (router_ifinfo)
@@ -2523,9 +2523,9 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)
25232523
tmp_gw_factor *= 100 * 100;
25242524
tmp_gw_factor >>= 18;
25252525

2526-
if ((tmp_gw_factor > max_gw_factor) ||
2527-
((tmp_gw_factor == max_gw_factor) &&
2528-
(tq_avg > max_tq))) {
2526+
if (tmp_gw_factor > max_gw_factor ||
2527+
(tmp_gw_factor == max_gw_factor &&
2528+
tq_avg > max_tq)) {
25292529
if (curr_gw)
25302530
batadv_gw_node_put(curr_gw);
25312531
curr_gw = gw_node;

‎net/batman-adv/bat_v.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv)
767767
if (batadv_v_gw_throughput_get(gw_node, &bw) < 0)
768768
goto next;
769769

770-
if (curr_gw && (bw <= max_bw))
770+
if (curr_gw && bw <= max_bw)
771771
goto next;
772772

773773
if (curr_gw)

‎net/batman-adv/bat_v_elp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
134134
hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX;
135135

136136
throughput = link_settings.base.speed;
137-
if (throughput && (throughput != SPEED_UNKNOWN))
137+
if (throughput && throughput != SPEED_UNKNOWN)
138138
return throughput * 10;
139139
}
140140

@@ -263,8 +263,8 @@ static void batadv_v_elp_periodic_work(struct work_struct *work)
263263
goto out;
264264

265265
/* we are in the process of shutting this interface down */
266-
if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
267-
(hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
266+
if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||
267+
hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)
268268
goto out;
269269

270270
/* the interface was enabled but may not be ready yet */

‎net/batman-adv/bat_v_ogm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv,
304304
* due to the store & forward characteristics of WIFI.
305305
* Very low throughput values are the exception.
306306
*/
307-
if ((throughput > 10) &&
308-
(if_incoming == if_outgoing) &&
307+
if (throughput > 10 &&
308+
if_incoming == if_outgoing &&
309309
!(if_incoming->bat_v.flags & BATADV_FULL_DUPLEX))
310310
return throughput / 2;
311311

@@ -455,7 +455,7 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv,
455455
/* drop packets with old seqnos, however accept the first packet after
456456
* a host has been rebooted.
457457
*/
458-
if ((seq_diff < 0) && !protection_started)
458+
if (seq_diff < 0 && !protection_started)
459459
goto out;
460460

461461
neigh_node->last_seen = jiffies;
@@ -568,8 +568,8 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,
568568
router_throughput = router_ifinfo->bat_v.throughput;
569569
neigh_throughput = neigh_ifinfo->bat_v.throughput;
570570

571-
if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) &&
572-
(router_throughput >= neigh_throughput))
571+
if (neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF &&
572+
router_throughput >= neigh_throughput)
573573
goto out;
574574
}
575575

@@ -621,7 +621,7 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,
621621
return;
622622

623623
/* only unknown & newer OGMs contain TVLVs we are interested in */
624-
if ((seqno_age > 0) && (if_outgoing == BATADV_IF_DEFAULT))
624+
if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT)
625625
batadv_tvlv_containers_process(bat_priv, true, orig_node,
626626
NULL, NULL,
627627
(unsigned char *)(ogm2 + 1),

‎net/batman-adv/distributed-arp-table.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
492492
/* this is an hash collision with the temporary selected node. Choose
493493
* the one with the lowest address
494494
*/
495-
if ((tmp_max == max) && max_orig_node &&
496-
(batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0))
495+
if (tmp_max == max && max_orig_node &&
496+
batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0)
497497
goto out;
498498

499499
ret = true;

‎net/batman-adv/gateway_client.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,12 @@ void batadv_gw_election(struct batadv_priv *bat_priv)
248248
}
249249
}
250250

251-
if ((curr_gw) && (!next_gw)) {
251+
if (curr_gw && !next_gw) {
252252
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
253253
"Removing selected gateway - no gateway in range\n");
254254
batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL,
255255
NULL);
256-
} else if ((!curr_gw) && (next_gw)) {
256+
} else if (!curr_gw && next_gw) {
257257
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
258258
"Adding route to gateway %pM (bandwidth: %u.%u/%u.%u MBit, tq: %i)\n",
259259
next_gw->orig_node->orig,
@@ -411,8 +411,8 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,
411411
goto out;
412412
}
413413

414-
if ((gw_node->bandwidth_down == ntohl(gateway->bandwidth_down)) &&
415-
(gw_node->bandwidth_up == ntohl(gateway->bandwidth_up)))
414+
if (gw_node->bandwidth_down == ntohl(gateway->bandwidth_down) &&
415+
gw_node->bandwidth_up == ntohl(gateway->bandwidth_up))
416416
goto out;
417417

418418
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

‎net/batman-adv/gateway_common.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ bool batadv_parse_throughput(struct net_device *net_dev, char *buff,
5656
if (strncasecmp(tmp_ptr, "mbit", 4) == 0)
5757
bw_unit_type = BATADV_BW_UNIT_MBIT;
5858

59-
if ((strncasecmp(tmp_ptr, "kbit", 4) == 0) ||
60-
(bw_unit_type == BATADV_BW_UNIT_MBIT))
59+
if (strncasecmp(tmp_ptr, "kbit", 4) == 0 ||
60+
bw_unit_type == BATADV_BW_UNIT_MBIT)
6161
*tmp_ptr = '\0';
6262
}
6363

@@ -190,7 +190,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,
190190
if (!up_new)
191191
up_new = 1;
192192

193-
if ((down_curr == down_new) && (up_curr == up_new))
193+
if (down_curr == down_new && up_curr == up_new)
194194
return count;
195195

196196
batadv_gw_reselect(bat_priv);
@@ -224,16 +224,16 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
224224
/* only fetch the tvlv value if the handler wasn't called via the
225225
* CIFNOTFND flag and if there is data to fetch
226226
*/
227-
if ((flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND) ||
228-
(tvlv_value_len < sizeof(gateway))) {
227+
if (flags & BATADV_TVLV_HANDLER_OGM_CIFNOTFND ||
228+
tvlv_value_len < sizeof(gateway)) {
229229
gateway.bandwidth_down = 0;
230230
gateway.bandwidth_up = 0;
231231
} else {
232232
gateway_ptr = tvlv_value;
233233
gateway.bandwidth_down = gateway_ptr->bandwidth_down;
234234
gateway.bandwidth_up = gateway_ptr->bandwidth_up;
235-
if ((gateway.bandwidth_down == 0) ||
236-
(gateway.bandwidth_up == 0)) {
235+
if (gateway.bandwidth_down == 0 ||
236+
gateway.bandwidth_up == 0) {
237237
gateway.bandwidth_down = 0;
238238
gateway.bandwidth_up = 0;
239239
}
@@ -242,8 +242,8 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
242242
batadv_gw_node_update(bat_priv, orig, &gateway);
243243

244244
/* restart gateway selection */
245-
if ((gateway.bandwidth_down != 0) &&
246-
(atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT))
245+
if (gateway.bandwidth_down != 0 &&
246+
atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT)
247247
batadv_gw_check_election(bat_priv, orig);
248248
}
249249

‎net/batman-adv/hard-interface.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev)
504504

505505
rcu_read_lock();
506506
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
507-
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
508-
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
507+
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
508+
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
509509
continue;
510510

511511
if (hard_iface->net_dev == net_dev)
@@ -568,8 +568,8 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface)
568568

569569
rcu_read_lock();
570570
list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
571-
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
572-
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
571+
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
572+
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
573573
continue;
574574

575575
if (hard_iface->soft_iface != soft_iface)
@@ -654,8 +654,8 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
654654
static void
655655
batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)
656656
{
657-
if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&
658-
(hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))
657+
if (hard_iface->if_status != BATADV_IF_ACTIVE &&
658+
hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)
659659
return;
660660

661661
hard_iface->if_status = BATADV_IF_INACTIVE;

‎net/batman-adv/icmp_socket.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ static ssize_t batadv_socket_read(struct file *file, char __user *buf,
132132
size_t packet_len;
133133
int error;
134134

135-
if ((file->f_flags & O_NONBLOCK) && (socket_client->queue_len == 0))
135+
if ((file->f_flags & O_NONBLOCK) && socket_client->queue_len == 0)
136136
return -EAGAIN;
137137

138-
if ((!buf) || (count < sizeof(struct batadv_icmp_packet)))
138+
if (!buf || count < sizeof(struct batadv_icmp_packet))
139139
return -EINVAL;
140140

141141
if (!access_ok(VERIFY_WRITE, buf, count))

‎net/batman-adv/main.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
* list traversals just rcu-locked
7474
*/
7575
struct list_head batadv_hardif_list;
76-
static int (*batadv_rx_handler[256])(struct sk_buff *,
77-
struct batadv_hard_iface *);
76+
static int (*batadv_rx_handler[256])(struct sk_buff *skb,
77+
struct batadv_hard_iface *recv_if);
7878

7979
unsigned char batadv_broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
8080

@@ -540,12 +540,12 @@ batadv_recv_handler_register(u8 packet_type,
540540
int (*recv_handler)(struct sk_buff *,
541541
struct batadv_hard_iface *))
542542
{
543-
int (*curr)(struct sk_buff *,
544-
struct batadv_hard_iface *);
543+
int (*curr)(struct sk_buff *skb,
544+
struct batadv_hard_iface *recv_if);
545545
curr = batadv_rx_handler[packet_type];
546546

547-
if ((curr != batadv_recv_unhandled_packet) &&
548-
(curr != batadv_recv_unhandled_unicast_packet))
547+
if (curr != batadv_recv_unhandled_packet &&
548+
curr != batadv_recv_unhandled_unicast_packet)
549549
return -EBUSY;
550550

551551
batadv_rx_handler[packet_type] = recv_handler;

‎net/batman-adv/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define BATADV_DRIVER_DEVICE "batman-adv"
2525

2626
#ifndef BATADV_SOURCE_VERSION
27-
#define BATADV_SOURCE_VERSION "2017.3"
27+
#define BATADV_SOURCE_VERSION "2017.4"
2828
#endif
2929

3030
/* B.A.T.M.A.N. parameters */

‎net/batman-adv/multicast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv,
11261126
bool orig_initialized;
11271127

11281128
if (orig_mcast_enabled && tvlv_value &&
1129-
(tvlv_value_len >= sizeof(mcast_flags)))
1129+
tvlv_value_len >= sizeof(mcast_flags))
11301130
mcast_flags = *(u8 *)tvlv_value;
11311131

11321132
spin_lock_bh(&orig->mcast_handler_lock);

‎net/batman-adv/originator.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,9 +1062,9 @@ batadv_purge_neigh_ifinfo(struct batadv_priv *bat_priv,
10621062
continue;
10631063

10641064
/* don't purge if the interface is not (going) down */
1065-
if ((if_outgoing->if_status != BATADV_IF_INACTIVE) &&
1066-
(if_outgoing->if_status != BATADV_IF_NOT_IN_USE) &&
1067-
(if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED))
1065+
if (if_outgoing->if_status != BATADV_IF_INACTIVE &&
1066+
if_outgoing->if_status != BATADV_IF_NOT_IN_USE &&
1067+
if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED)
10681068
continue;
10691069

10701070
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
@@ -1106,9 +1106,9 @@ batadv_purge_orig_ifinfo(struct batadv_priv *bat_priv,
11061106
continue;
11071107

11081108
/* don't purge if the interface is not (going) down */
1109-
if ((if_outgoing->if_status != BATADV_IF_INACTIVE) &&
1110-
(if_outgoing->if_status != BATADV_IF_NOT_IN_USE) &&
1111-
(if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED))
1109+
if (if_outgoing->if_status != BATADV_IF_INACTIVE &&
1110+
if_outgoing->if_status != BATADV_IF_NOT_IN_USE &&
1111+
if_outgoing->if_status != BATADV_IF_TO_BE_REMOVED)
11121112
continue;
11131113

11141114
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
@@ -1155,13 +1155,13 @@ batadv_purge_orig_neighbors(struct batadv_priv *bat_priv,
11551155
last_seen = neigh_node->last_seen;
11561156
if_incoming = neigh_node->if_incoming;
11571157

1158-
if ((batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT)) ||
1159-
(if_incoming->if_status == BATADV_IF_INACTIVE) ||
1160-
(if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
1161-
(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)) {
1162-
if ((if_incoming->if_status == BATADV_IF_INACTIVE) ||
1163-
(if_incoming->if_status == BATADV_IF_NOT_IN_USE) ||
1164-
(if_incoming->if_status == BATADV_IF_TO_BE_REMOVED))
1158+
if (batadv_has_timed_out(last_seen, BATADV_PURGE_TIMEOUT) ||
1159+
if_incoming->if_status == BATADV_IF_INACTIVE ||
1160+
if_incoming->if_status == BATADV_IF_NOT_IN_USE ||
1161+
if_incoming->if_status == BATADV_IF_TO_BE_REMOVED) {
1162+
if (if_incoming->if_status == BATADV_IF_INACTIVE ||
1163+
if_incoming->if_status == BATADV_IF_NOT_IN_USE ||
1164+
if_incoming->if_status == BATADV_IF_TO_BE_REMOVED)
11651165
batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
11661166
"neighbor purge: originator %pM, neighbor: %pM, iface: %s\n",
11671167
orig_node->orig, neigh_node->addr,

0 commit comments

Comments
 (0)