* [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06
@ 2017-10-06 13:54 Simon Wunderlich
2017-10-06 13:54 ` [PATCH 2/4] batman-adv: Remove unnecessary parentheses Simon Wunderlich
` (3 more replies)
0 siblings, 4 replies; 20+ messages in thread
From: Simon Wunderlich @ 2017-10-06 13:54 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi David,
here is a small cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 242c1a28eb61cb34974e8aa05235d84355940a8a:
net: Remove useless function skb_header_release (2017-09-22 20:43:13 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20171006
for you to fetch changes up to 706cc9f51d9a22528af18d4b3ffbd17b30a1d3b0:
batman-adv: Add argument names for function ptr definitions (2017-09-30 09:31:34 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches)
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Remove unnecessary parentheses
batman-adv: Fix "line over 80 characters" checkpatch warning
batman-adv: Add argument names for function ptr definitions
net/batman-adv/bat_iv_ogm.c | 24 ++++++++++++------------
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/bat_v_elp.c | 6 +++---
net/batman-adv/bat_v_ogm.c | 12 ++++++------
net/batman-adv/distributed-arp-table.c | 4 ++--
net/batman-adv/gateway_client.c | 8 ++++----
net/batman-adv/gateway_common.c | 18 +++++++++---------
net/batman-adv/hard-interface.c | 12 ++++++------
net/batman-adv/icmp_socket.c | 4 ++--
net/batman-adv/main.c | 12 ++++++------
net/batman-adv/main.h | 2 +-
net/batman-adv/multicast.c | 2 +-
net/batman-adv/originator.c | 26 +++++++++++++-------------
net/batman-adv/routing.c | 6 +++---
net/batman-adv/send.c | 6 +++---
net/batman-adv/soft-interface.c | 6 +++---
net/batman-adv/sysfs.c | 4 ++--
net/batman-adv/tp_meter.c | 2 +-
18 files changed, 78 insertions(+), 78 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 2/4] batman-adv: Remove unnecessary parentheses 2017-10-06 13:54 [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 Simon Wunderlich @ 2017-10-06 13:54 ` Simon Wunderlich 2017-10-06 13:54 ` [PATCH 3/4] batman-adv: Fix "line over 80 characters" checkpatch warning Simon Wunderlich ` (2 subsequent siblings) 3 siblings, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2017-10-06 13:54 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich From: Sven Eckelmann <sven@narfation•org> checkpatch introduced with commit 63b7c73ec86b ("checkpatch: add --strict check for ifs with unnecessary parentheses") an additional test which identifies some unnecessary parentheses. Remove these unnecessary parentheses to avoid the warnings and to unify the coding style slightly more. Signed-off-by: Sven Eckelmann <sven@narfation•org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/bat_iv_ogm.c | 24 ++++++++++++------------ net/batman-adv/bat_v.c | 2 +- net/batman-adv/bat_v_elp.c | 6 +++--- net/batman-adv/bat_v_ogm.c | 12 ++++++------ net/batman-adv/distributed-arp-table.c | 4 ++-- net/batman-adv/gateway_client.c | 8 ++++---- net/batman-adv/gateway_common.c | 18 +++++++++--------- net/batman-adv/hard-interface.c | 12 ++++++------ net/batman-adv/icmp_socket.c | 4 ++-- net/batman-adv/main.c | 4 ++-- net/batman-adv/multicast.c | 2 +- net/batman-adv/originator.c | 26 +++++++++++++------------- net/batman-adv/routing.c | 6 +++--- net/batman-adv/send.c | 6 +++--- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/sysfs.c | 4 ++-- net/batman-adv/tp_meter.c | 2 +- 17 files changed, 71 insertions(+), 71 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 83ba5483455a..1b659ab652fb 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -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; diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 4e2724c5b33d..93ef1c06227e 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -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) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index bd1064d98e16..1de992c58b35 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -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 */ diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 8be61734fc43..c251445a42a0 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -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), diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index b6cfa78e9381..760c0de72582 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -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; diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index de9955d5224d..10d521f0b17f 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -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, diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 33940c5c74a8..2c26039c23fc 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -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); } diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index e348f76ea8c1..d4aa99c060f9 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -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 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) 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; diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 8ead292886d1..bded31121d12 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -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)) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index fb381fb26a66..033819aefc39 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -544,8 +544,8 @@ batadv_recv_handler_register(u8 packet_type, struct batadv_hard_iface *); 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; diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index d327670641ac..e553a8770a89 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -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); diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 8e2a4b205257..2967b86c13da 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -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, diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index f10e3ff26f9d..40d9bf3e5bfe 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -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; diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 054a65e6eb68..7895323fd2a7 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -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); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c2c986746d0b..7c8288245f80 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -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; diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 0ae8b30e4eaa..aa187fd42475 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -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) { diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index bfe8effe9238..4b90033f35a8 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -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; } -- 2.11.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/4] batman-adv: Fix "line over 80 characters" checkpatch warning 2017-10-06 13:54 [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 Simon Wunderlich 2017-10-06 13:54 ` [PATCH 2/4] batman-adv: Remove unnecessary parentheses Simon Wunderlich @ 2017-10-06 13:54 ` Simon Wunderlich [not found] ` <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2017-10-06 17:13 ` [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 David Miller 3 siblings, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2017-10-06 13:54 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Sven Eckelmann, Simon Wunderlich From: Sven Eckelmann <sven@narfation•org> Fixes: 242c1a28eb61 ("net: Remove useless function skb_header_release") Signed-off-by: Sven Eckelmann <sven@narfation•org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 7c8288245f80..3af4b0b29b23 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -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. -- 2.11.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
[parent not found: <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>]
* [PATCH 1/4] batman-adv: Start new development cycle [not found] ` <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> @ 2017-10-06 13:54 ` Simon Wunderlich 2017-10-06 13:54 ` [PATCH 4/4] batman-adv: Add argument names for function ptr definitions Simon Wunderlich 1 sibling, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2017-10-06 13:54 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public•gmane.org> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 05cc7637c064..edb2f239d04d 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -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 */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/4] batman-adv: Add argument names for function ptr definitions [not found] ` <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> 2017-10-06 13:54 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2017-10-06 13:54 ` Simon Wunderlich 1 sibling, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2017-10-06 13:54 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: netdev-u79uwXL29TY76Z2rM5mHXA, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public•gmane.org> checkpatch started to report unnamed arguments in function pointer definitions. Add the corresponding names to these definitions to avoid this warning. Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public•gmane.org> Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public•gmane.org> --- net/batman-adv/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 033819aefc39..4daed7ad46f2 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -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,8 +540,8 @@ 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 && -- 2.11.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 2017-10-06 13:54 [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 Simon Wunderlich ` (2 preceding siblings ...) [not found] ` <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> @ 2017-10-06 17:13 ` David Miller 3 siblings, 0 replies; 20+ messages in thread From: David Miller @ 2017-10-06 17:13 UTC (permalink / raw) To: sw; +Cc: netdev, b.a.t.m.a.n From: Simon Wunderlich <sw@simonwunderlich•de> Date: Fri, 6 Oct 2017 15:54:33 +0200 > here is a small cleanup pull request of batman-adv to go into net-next. > > Please pull or let me know of any problem! Pulled, thanks Simon. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2019-08-08
@ 2019-08-08 13:06 Simon Wunderlich
2019-08-08 13:06 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2019-08-08 13:06 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi David,
here is a small feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:
Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190808
for you to fetch changes up to 9cb9a17813bf0de1f8ad6deb9538296d5148b5a8:
batman-adv: BATMAN_V: aggregate OGMv2 packets (2019-08-04 22:22:00 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Replace usage of strlcpy with strscpy, by Sven Eckelmann
- Add OGMv2 per-interface queue and aggregations, by Linus Luessing
(2 patches)
----------------------------------------------------------------
Linus Lüssing (2):
batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues
batman-adv: BATMAN_V: aggregate OGMv2 packets
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Replace usage of strlcpy with strscpy
net/batman-adv/bat_v.c | 7 ++
net/batman-adv/bat_v_ogm.c | 179 +++++++++++++++++++++++++++++++++++++++-
net/batman-adv/bat_v_ogm.h | 3 +
net/batman-adv/main.h | 2 +-
net/batman-adv/soft-interface.c | 8 +-
net/batman-adv/sysfs.c | 2 +-
net/batman-adv/types.h | 12 +++
7 files changed, 205 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2019-08-08 13:06 [PATCH 0/4] pull request for net-next: batman-adv 2019-08-08 Simon Wunderlich @ 2019-08-08 13:06 ` Simon Wunderlich 0 siblings, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2019-08-08 13:06 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 3d4c04d87ff3..6967f2e4c3f4 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2019.3" +#define BATADV_SOURCE_VERSION "2019.4" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2020-06-26
@ 2020-06-30 8:27 Simon Wunderlich
2020-06-30 8:27 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2020-06-30 8:27 UTC (permalink / raw)
To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi David,
here is a little feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407:
Linux 5.8-rc1 (2020-06-14 12:45:04 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20200630
for you to fetch changes up to 3bda14d09dc5789a895ab02b7dcfcec19b0a65b3:
batman-adv: Introduce a configurable per interface hop penalty (2020-06-26 10:37:11 +0200)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- update mailing list URL, by Sven Eckelmann
- fix typos and grammar in documentation, by Sven Eckelmann
- introduce a configurable per interface hop penalty,
by Linus Luessing
----------------------------------------------------------------
Linus Lüssing (1):
batman-adv: Introduce a configurable per interface hop penalty
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Switch mailing list subscription page
batman-adv: Fix typos and grammar in documentation
Documentation/networking/batman-adv.rst | 8 +++---
include/uapi/linux/batadv_packet.h | 50 ++++++++++++++++-----------------
include/uapi/linux/batman_adv.h | 7 +++--
net/batman-adv/bat_iv_ogm.c | 25 +++++++++--------
net/batman-adv/bat_v_elp.c | 10 +++----
net/batman-adv/bat_v_ogm.c | 27 +++++++++++-------
net/batman-adv/bridge_loop_avoidance.c | 6 ++--
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/fragmentation.c | 6 ++--
net/batman-adv/hard-interface.c | 16 ++++++-----
net/batman-adv/log.h | 6 ++--
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 8 +++---
net/batman-adv/multicast.c | 21 +++++++-------
net/batman-adv/netlink.c | 14 +++++++--
net/batman-adv/network-coding.c | 14 ++++-----
net/batman-adv/originator.c | 8 +++---
net/batman-adv/routing.c | 4 +--
net/batman-adv/send.c | 4 +--
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/tp_meter.c | 12 ++++----
net/batman-adv/translation-table.c | 10 +++----
net/batman-adv/tvlv.c | 4 +--
net/batman-adv/types.h | 18 ++++++++----
24 files changed, 156 insertions(+), 128 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2020-06-30 8:27 [PATCH 0/4] pull request for net-next: batman-adv 2020-06-26 Simon Wunderlich @ 2020-06-30 8:27 ` Simon Wunderlich 0 siblings, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2020-06-30 8:27 UTC (permalink / raw) To: davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 61d8dbe8c954..42b8d1e76dea 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2020.2" +#define BATADV_SOURCE_VERSION "2020.3" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02
@ 2021-02-02 17:40 Simon Wunderlich
2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:
Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210202
for you to fetch changes up to 5234e44068060ae45330a5ab972ff86c733ada2f:
batman-adv: Fix names for kernel-doc blocks (2021-01-28 17:46:29 +0100)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- Bump version strings, by Simon Wunderlich
- Update copyright years for 2021, by Sven Eckelmann
- Avoid sizeof on flexible structure, by Sven Eckelmann
- Fix names for kernel-doc blocks, by Sven Eckelmann
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Update copyright years for 2021
batman-adv: Avoid sizeof on flexible structure
batman-adv: Fix names for kernel-doc blocks
include/uapi/linux/batadv_packet.h | 2 +-
include/uapi/linux/batman_adv.h | 2 +-
net/batman-adv/Kconfig | 2 +-
net/batman-adv/Makefile | 2 +-
net/batman-adv/bat_algo.c | 2 +-
net/batman-adv/bat_algo.h | 2 +-
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/bat_iv_ogm.h | 2 +-
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/bat_v.h | 2 +-
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_elp.h | 2 +-
net/batman-adv/bat_v_ogm.c | 2 +-
net/batman-adv/bat_v_ogm.h | 2 +-
net/batman-adv/bitarray.c | 2 +-
net/batman-adv/bitarray.h | 2 +-
net/batman-adv/bridge_loop_avoidance.c | 2 +-
net/batman-adv/bridge_loop_avoidance.h | 2 +-
net/batman-adv/distributed-arp-table.c | 6 +++---
net/batman-adv/distributed-arp-table.h | 2 +-
net/batman-adv/fragmentation.c | 2 +-
net/batman-adv/fragmentation.h | 2 +-
net/batman-adv/gateway_client.c | 2 +-
net/batman-adv/gateway_client.h | 2 +-
net/batman-adv/gateway_common.c | 2 +-
net/batman-adv/gateway_common.h | 2 +-
net/batman-adv/hard-interface.c | 2 +-
net/batman-adv/hard-interface.h | 2 +-
net/batman-adv/hash.c | 2 +-
net/batman-adv/hash.h | 2 +-
net/batman-adv/log.c | 2 +-
net/batman-adv/log.h | 2 +-
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 4 ++--
net/batman-adv/multicast.c | 4 ++--
net/batman-adv/multicast.h | 2 +-
net/batman-adv/netlink.c | 6 +++---
net/batman-adv/netlink.h | 2 +-
net/batman-adv/network-coding.c | 2 +-
net/batman-adv/network-coding.h | 2 +-
net/batman-adv/originator.c | 2 +-
net/batman-adv/originator.h | 2 +-
net/batman-adv/routing.c | 2 +-
net/batman-adv/routing.h | 2 +-
net/batman-adv/send.c | 2 +-
net/batman-adv/send.h | 2 +-
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/soft-interface.h | 2 +-
net/batman-adv/tp_meter.c | 4 ++--
net/batman-adv/tp_meter.h | 2 +-
net/batman-adv/trace.c | 2 +-
net/batman-adv/trace.h | 2 +-
net/batman-adv/translation-table.c | 2 +-
net/batman-adv/translation-table.h | 2 +-
net/batman-adv/tvlv.c | 2 +-
net/batman-adv/tvlv.h | 2 +-
net/batman-adv/types.h | 5 +++--
57 files changed, 66 insertions(+), 65 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich @ 2021-02-02 17:40 ` Simon Wunderlich 2021-02-04 0:33 ` Jakub Kicinski 0 siblings, 1 reply; 20+ messages in thread From: Simon Wunderlich @ 2021-02-02 17:40 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 288201630ceb..2486efe4ffa6 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2021.0" +#define BATADV_SOURCE_VERSION "2021.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2021-02-04 0:33 ` Jakub Kicinski 2021-02-04 7:41 ` Sven Eckelmann 0 siblings, 1 reply; 20+ messages in thread From: Jakub Kicinski @ 2021-02-04 0:33 UTC (permalink / raw) To: Simon Wunderlich; +Cc: davem, netdev, b.a.t.m.a.n On Tue, 2 Feb 2021 18:40:33 +0100 Simon Wunderlich wrote: > Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> > --- > net/batman-adv/main.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h > index 288201630ceb..2486efe4ffa6 100644 > --- a/net/batman-adv/main.h > +++ b/net/batman-adv/main.h > @@ -13,7 +13,7 @@ > #define BATADV_DRIVER_DEVICE "batman-adv" > > #ifndef BATADV_SOURCE_VERSION > -#define BATADV_SOURCE_VERSION "2021.0" > +#define BATADV_SOURCE_VERSION "2021.1" > #endif > > /* B.A.T.M.A.N. parameters */ For just comment adjustments and the sizeof() change? ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2021-02-04 0:33 ` Jakub Kicinski @ 2021-02-04 7:41 ` Sven Eckelmann 0 siblings, 0 replies; 20+ messages in thread From: Sven Eckelmann @ 2021-02-04 7:41 UTC (permalink / raw) To: Simon Wunderlich, b.a.t.m.a.n; +Cc: davem, netdev, b.a.t.m.a.n, Jakub Kicinski [-- Attachment #1: Type: text/plain, Size: 460 bytes --] On Thursday, 4 February 2021 01:33:02 CET Jakub Kicinski wrote: [...] > For just comment adjustments and the sizeof() change? The process is basically: 1. update the version information for a development period 2. queue up whatever comes in during that time 3. send it to netdev for net-next when it seems to be ready The first step is not influenced by the 2.+3. step. So the development effort is not reflected in the version number. Kind regards, Sven [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08
@ 2021-02-08 16:59 Simon Wunderlich
2021-02-08 16:59 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2021-02-08 16:59 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is the updated pull request of batman-adv to go into net-next. We
have updated the first two patches as discussed (added justification
for the first, replaced the second to remove copyright years). The other
two patches are unchanged.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e:
Linux 5.11-rc1 (2020-12-27 15:30:22 -0800)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210208
for you to fetch changes up to 25d81f9307ffc166427d93152498f45178f5936a:
batman-adv: Fix names for kernel-doc blocks (2021-02-06 09:22:45 +0100)
----------------------------------------------------------------
This feature/cleanup patchset is an updated version of the pull request
of Feb 2nd (batadv-next-pullrequest-20210202) and includes the
following patches:
- Bump version strings, by Simon Wunderlich (added commit log)
- Drop publication years from copyright info, by Sven Eckelmann
(replaced the previous patch which updated copyright years, as per
our discussion)
- Avoid sizeof on flexible structure, by Sven Eckelmann (unchanged)
- Fix names for kernel-doc blocks, by Sven Eckelmann (unchanged)
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Drop publication years from copyright info
batman-adv: Avoid sizeof on flexible structure
batman-adv: Fix names for kernel-doc blocks
include/uapi/linux/batadv_packet.h | 2 +-
include/uapi/linux/batman_adv.h | 2 +-
net/batman-adv/Kconfig | 2 +-
net/batman-adv/Makefile | 2 +-
net/batman-adv/bat_algo.c | 2 +-
net/batman-adv/bat_algo.h | 2 +-
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/bat_iv_ogm.h | 2 +-
net/batman-adv/bat_v.c | 2 +-
net/batman-adv/bat_v.h | 2 +-
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_elp.h | 2 +-
net/batman-adv/bat_v_ogm.c | 2 +-
net/batman-adv/bat_v_ogm.h | 2 +-
net/batman-adv/bitarray.c | 2 +-
net/batman-adv/bitarray.h | 2 +-
net/batman-adv/bridge_loop_avoidance.c | 2 +-
net/batman-adv/bridge_loop_avoidance.h | 2 +-
net/batman-adv/distributed-arp-table.c | 6 +++---
net/batman-adv/distributed-arp-table.h | 2 +-
net/batman-adv/fragmentation.c | 2 +-
net/batman-adv/fragmentation.h | 2 +-
net/batman-adv/gateway_client.c | 2 +-
net/batman-adv/gateway_client.h | 2 +-
net/batman-adv/gateway_common.c | 2 +-
net/batman-adv/gateway_common.h | 2 +-
net/batman-adv/hard-interface.c | 2 +-
net/batman-adv/hard-interface.h | 2 +-
net/batman-adv/hash.c | 2 +-
net/batman-adv/hash.h | 2 +-
net/batman-adv/log.c | 2 +-
net/batman-adv/log.h | 2 +-
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 4 ++--
net/batman-adv/multicast.c | 4 ++--
net/batman-adv/multicast.h | 2 +-
net/batman-adv/netlink.c | 6 +++---
net/batman-adv/netlink.h | 2 +-
net/batman-adv/network-coding.c | 2 +-
net/batman-adv/network-coding.h | 2 +-
net/batman-adv/originator.c | 2 +-
net/batman-adv/originator.h | 2 +-
net/batman-adv/routing.c | 2 +-
net/batman-adv/routing.h | 2 +-
net/batman-adv/send.c | 2 +-
net/batman-adv/send.h | 2 +-
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/soft-interface.h | 2 +-
net/batman-adv/tp_meter.c | 4 ++--
net/batman-adv/tp_meter.h | 2 +-
net/batman-adv/trace.c | 2 +-
net/batman-adv/trace.h | 2 +-
net/batman-adv/translation-table.c | 2 +-
net/batman-adv/translation-table.h | 2 +-
net/batman-adv/tvlv.c | 2 +-
net/batman-adv/tvlv.h | 2 +-
net/batman-adv/types.h | 5 +++--
57 files changed, 66 insertions(+), 65 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2021-02-08 16:59 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08 Simon Wunderlich @ 2021-02-08 16:59 ` Simon Wunderlich 0 siblings, 0 replies; 20+ messages in thread From: Simon Wunderlich @ 2021-02-08 16:59 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 5.12. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 288201630ceb..2486efe4ffa6 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2021.0" +#define BATADV_SOURCE_VERSION "2021.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2022-03-02
@ 2022-03-02 16:35 Simon Wunderlich
2022-03-02 16:35 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2022-03-02 16:35 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
There might be a small merge conflict between the net and net-next pull
requests which I both send today, specifically those two commits:
* (batadv/net) 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check")
* (batadv/net-next) 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message")
They should be resolved like this:
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -167,13 +167,7 @@
return false;
/* recurse over the parent device */
-<<<<<<<
- parent_dev = __dev_get_by_index((struct net *)parent_net,
- dev_get_iflink(net_dev));
-=======
parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
- /* if we got a NULL parent_dev there is something broken.. */
->>>>>>>
if (!parent_dev) {
pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",
net_dev->name);
Thank you,
Simon
The following changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
Linux 5.17-rc1 (2022-01-23 10:12:53 +0200)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20220302
for you to fetch changes up to 6ee3c393eeb7d16a3c228c4fa23913b76c7e7df3:
batman-adv: Demote batadv-on-batadv skip error message (2022-03-02 09:00:17 +0100)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET
- Migrate to linux/container_of.h, by Sven Eckelmann
- Demote batadv-on-batadv skip error message, by Sven Eckelmann
----------------------------------------------------------------
Christophe JAILLET (1):
batman-adv: Remove redundant 'flush_workqueue()' calls
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Migrate to linux/container_of.h
batman-adv: Demote batadv-on-batadv skip error message
net/batman-adv/bat_iv_ogm.c | 2 +-
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_ogm.c | 2 +-
net/batman-adv/bridge_loop_avoidance.c | 1 +
net/batman-adv/distributed-arp-table.c | 2 +-
net/batman-adv/gateway_client.c | 1 +
net/batman-adv/hard-interface.c | 6 +++---
net/batman-adv/main.c | 2 +-
net/batman-adv/main.h | 2 +-
net/batman-adv/multicast.c | 1 +
net/batman-adv/network-coding.c | 2 +-
net/batman-adv/originator.c | 2 +-
net/batman-adv/send.c | 2 +-
net/batman-adv/soft-interface.c | 2 +-
net/batman-adv/tp_meter.c | 2 +-
net/batman-adv/translation-table.c | 2 +-
net/batman-adv/tvlv.c | 2 +-
17 files changed, 19 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2022-03-02 16:35 [PATCH 0/4] pull request for net-next: batman-adv 2022-03-02 Simon Wunderlich @ 2022-03-02 16:35 ` Simon Wunderlich 2022-03-03 6:10 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 20+ messages in thread From: Simon Wunderlich @ 2022-03-02 16:35 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 5.18. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 494d1ebecac2..f3be82999f1f 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.0" +#define BATADV_SOURCE_VERSION "2022.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.30.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2022-03-02 16:35 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2022-03-03 6:10 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 20+ messages in thread From: patchwork-bot+netdevbpf @ 2022-03-03 6:10 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Hello: This series was applied to netdev/net-next.git (master) by Simon Wunderlich <sw@simonwunderlich•de>: On Wed, 2 Mar 2022 17:35:19 +0100 you wrote: > This version will contain all the (major or even only minor) changes for > Linux 5.18. > > The version number isn't a semantic version number with major and minor > information. It is just encoding the year of the expected publishing as > Linux -rc1 and the number of published versions this year (starting at 0). > > [...] Here is the summary with links: - [1/4] batman-adv: Start new development cycle https://git.kernel.org/netdev/net-next/c/94ea9392e113 - [2/4] batman-adv: Remove redundant 'flush_workqueue()' calls https://git.kernel.org/netdev/net-next/c/c138f67ad472 - [3/4] batman-adv: Migrate to linux/container_of.h https://git.kernel.org/netdev/net-next/c/eb7da4f17dfc - [4/4] batman-adv: Demote batadv-on-batadv skip error message https://git.kernel.org/netdev/net-next/c/6ee3c393eeb7 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16
@ 2022-09-16 16:14 Simon Wunderlich
2022-09-16 16:14 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2022-09-16 16:14 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868:
Linux 6.0-rc1 (2022-08-14 15:50:18 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20220916
for you to fetch changes up to 76af7483b3c7c42571aae767b553ef7d436305e9:
batman-adv: remove unused struct definitions (2022-09-15 08:16:05 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- drop unused headers in trace.h, by Sven Eckelmann
- drop initialization of flexible ethtool_link_ksettings,
by Sven Eckelmann
- remove unused struct definitions, by Marek Lindner
----------------------------------------------------------------
Marek Lindner (1):
batman-adv: remove unused struct definitions
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Drop unused headers in trace.h
batman-adv: Drop initialization of flexible ethtool_link_ksettings
net/batman-adv/bat_v_elp.c | 1 -
net/batman-adv/main.h | 2 +-
net/batman-adv/trace.h | 2 --
net/batman-adv/types.h | 39 ---------------------------------------
4 files changed, 1 insertion(+), 43 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2022-09-16 16:14 [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16 Simon Wunderlich @ 2022-09-16 16:14 ` Simon Wunderlich 2022-09-20 1:20 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 20+ messages in thread From: Simon Wunderlich @ 2022-09-16 16:14 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 6.1. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 23f3d53f4b51..c48803b32bb0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2022.2" +#define BATADV_SOURCE_VERSION "2022.3" #endif /* B.A.T.M.A.N. parameters */ -- 2.30.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2022-09-16 16:14 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2022-09-20 1:20 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 20+ messages in thread From: patchwork-bot+netdevbpf @ 2022-09-20 1:20 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Hello: This series was applied to netdev/net-next.git (master) by Simon Wunderlich <sw@simonwunderlich•de>: On Fri, 16 Sep 2022 18:14:51 +0200 you wrote: > This version will contain all the (major or even only minor) changes for > Linux 6.1. > > The version number isn't a semantic version number with major and minor > information. It is just encoding the year of the expected publishing as > Linux -rc1 and the number of published versions this year (starting at 0). > > [...] Here is the summary with links: - [1/4] batman-adv: Start new development cycle https://git.kernel.org/netdev/net-next/c/ea92882b1fd8 - [2/4] batman-adv: Drop unused headers in trace.h https://git.kernel.org/netdev/net-next/c/7d315c07eda7 - [3/4] batman-adv: Drop initialization of flexible ethtool_link_ksettings https://git.kernel.org/netdev/net-next/c/813e62a6fe75 - [4/4] batman-adv: remove unused struct definitions https://git.kernel.org/netdev/net-next/c/76af7483b3c7 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01
@ 2024-02-01 11:07 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 6613476e225e090cc9aad49be7fa504e290dd33d:
Linux 6.8-rc1 (2024-01-21 14:11:32 -0800)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20240201
for you to fetch changes up to db60ad8b21cee0394cb0a1092d9f9190d310562c:
batman-adv: Drop usage of export.h (2024-01-27 09:13:59 +0100)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Improve error handling in DAT and uevent generator,
by Markus Elfring (2 patches)
- Drop usage of export.h, by Sven Eckelmann
----------------------------------------------------------------
Markus Elfring (2):
batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data()
batman-adv: Improve exception handling in batadv_throw_uevent()
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Drop usage of export.h
net/batman-adv/distributed-arp-table.c | 3 +--
net/batman-adv/main.c | 14 ++++++++------
net/batman-adv/main.h | 2 +-
net/batman-adv/netlink.c | 1 -
4 files changed, 10 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich @ 2024-02-01 11:07 ` Simon Wunderlich 2024-02-02 12:50 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 20+ messages in thread From: Simon Wunderlich @ 2024-02-01 11:07 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 6.9. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 870dcd7f1786..8ca854a75a32 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2024.0" +#define BATADV_SOURCE_VERSION "2024.1" #endif /* B.A.T.M.A.N. parameters */ -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2024-02-02 12:50 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 20+ messages in thread From: patchwork-bot+netdevbpf @ 2024-02-02 12:50 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Hello: This series was applied to netdev/net-next.git (main) by Simon Wunderlich <sw@simonwunderlich•de>: On Thu, 1 Feb 2024 12:07:53 +0100 you wrote: > This version will contain all the (major or even only minor) changes for > Linux 6.9. > > The version number isn't a semantic version number with major and minor > information. It is just encoding the year of the expected publishing as > Linux -rc1 and the number of published versions this year (starting at 0). > > [...] Here is the summary with links: - [1/4] batman-adv: Start new development cycle https://git.kernel.org/netdev/net-next/c/df3fc228dead - [2/4] batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() https://git.kernel.org/netdev/net-next/c/ffc15626c861 - [3/4] batman-adv: Improve exception handling in batadv_throw_uevent() https://git.kernel.org/netdev/net-next/c/5593e9abf1cf - [4/4] batman-adv: Drop usage of export.h https://git.kernel.org/netdev/net-next/c/db60ad8b21ce You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 0/4] pull request for net-next: batman-adv 2024-10-15
@ 2024-10-15 7:39 Simon Wunderlich
2024-10-15 7:39 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
0 siblings, 1 reply; 20+ messages in thread
From: Simon Wunderlich @ 2024-10-15 7:39 UTC (permalink / raw)
To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich
Hi Jakub, hi David,
here is a feature/cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 9852d85ec9d492ebef56dc5f229416c925758edc:
Linux 6.12-rc1 (2024-09-29 15:06:19 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20241015
for you to fetch changes up to 356c81b6c494a359ed6e25087931acc78c518fb9:
batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback (2024-10-14 09:08:39 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Add flex array to struct batadv_tvlv_tt_data, by Erick Archer
- Use string choice helper to print booleans, by Sven Eckelmann
- replace call_rcu by kfree_rcu for simple kmem_cache_free callback,
by Julia Lawall
----------------------------------------------------------------
Erick Archer (1):
batman-adv: Add flex array to struct batadv_tvlv_tt_data
Julia Lawall (1):
batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (1):
batman-adv: Use string choice helper to print booleans
include/uapi/linux/batadv_packet.h | 29 +++++-----
net/batman-adv/bat_iv_ogm.c | 4 +-
net/batman-adv/bridge_loop_avoidance.c | 8 +--
net/batman-adv/main.h | 2 +-
net/batman-adv/translation-table.c | 96 ++++++++--------------------------
5 files changed, 46 insertions(+), 93 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/4] batman-adv: Start new development cycle 2024-10-15 7:39 [PATCH 0/4] pull request for net-next: batman-adv 2024-10-15 Simon Wunderlich @ 2024-10-15 7:39 ` Simon Wunderlich 2024-10-15 13:40 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 20+ messages in thread From: Simon Wunderlich @ 2024-10-15 7:39 UTC (permalink / raw) To: kuba, davem; +Cc: netdev, b.a.t.m.a.n, Simon Wunderlich This version will contain all the (major or even only minor) changes for Linux 6.13. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw@simonwunderlich•de> --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 3d4c36ae2e1a..97ea71a052f8 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2024.2" +#define BATADV_SOURCE_VERSION "2024.3" #endif /* B.A.T.M.A.N. parameters */ -- 2.39.5 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/4] batman-adv: Start new development cycle 2024-10-15 7:39 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich @ 2024-10-15 13:40 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 20+ messages in thread From: patchwork-bot+netdevbpf @ 2024-10-15 13:40 UTC (permalink / raw) To: Simon Wunderlich; +Cc: kuba, davem, netdev, b.a.t.m.a.n Hello: This series was applied to netdev/net-next.git (main) by Simon Wunderlich <sw@simonwunderlich•de>: On Tue, 15 Oct 2024 09:39:43 +0200 you wrote: > This version will contain all the (major or even only minor) changes for > Linux 6.13. > > The version number isn't a semantic version number with major and minor > information. It is just encoding the year of the expected publishing as > Linux -rc1 and the number of published versions this year (starting at 0). > > [...] Here is the summary with links: - [1/4] batman-adv: Start new development cycle https://git.kernel.org/netdev/net-next/c/0f4e6f947600 - [2/4] batman-adv: Add flex array to struct batadv_tvlv_tt_data https://git.kernel.org/netdev/net-next/c/4436df478860 - [3/4] batman-adv: Use string choice helper to print booleans https://git.kernel.org/netdev/net-next/c/5c956d11cfca - [4/4] batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback https://git.kernel.org/netdev/net-next/c/356c81b6c494 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-10-15 13:40 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-06 13:54 [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 Simon Wunderlich
2017-10-06 13:54 ` [PATCH 2/4] batman-adv: Remove unnecessary parentheses Simon Wunderlich
2017-10-06 13:54 ` [PATCH 3/4] batman-adv: Fix "line over 80 characters" checkpatch warning Simon Wunderlich
[not found] ` <20171006135437.26736-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2017-10-06 13:54 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2017-10-06 13:54 ` [PATCH 4/4] batman-adv: Add argument names for function ptr definitions Simon Wunderlich
2017-10-06 17:13 ` [PATCH 0/4] pull request for net-next: batman-adv 2017-10-06 David Miller
-- strict thread matches above, loose matches on Subject: below --
2019-08-08 13:06 [PATCH 0/4] pull request for net-next: batman-adv 2019-08-08 Simon Wunderlich
2019-08-08 13:06 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2020-06-30 8:27 [PATCH 0/4] pull request for net-next: batman-adv 2020-06-26 Simon Wunderlich
2020-06-30 8:27 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2021-02-02 17:40 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-02 Simon Wunderlich
2021-02-02 17:40 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2021-02-04 0:33 ` Jakub Kicinski
2021-02-04 7:41 ` Sven Eckelmann
2021-02-08 16:59 [PATCH 0/4] pull request for net-next: batman-adv 2021-02-08 Simon Wunderlich
2021-02-08 16:59 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2022-03-02 16:35 [PATCH 0/4] pull request for net-next: batman-adv 2022-03-02 Simon Wunderlich
2022-03-02 16:35 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2022-03-03 6:10 ` patchwork-bot+netdevbpf
2022-09-16 16:14 [PATCH 0/4] pull request for net-next: batman-adv 2022-09-16 Simon Wunderlich
2022-09-16 16:14 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2022-09-20 1:20 ` patchwork-bot+netdevbpf
2024-02-01 11:07 [PATCH 0/4] pull request for net-next: batman-adv 2024-02-01 Simon Wunderlich
2024-02-01 11:07 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2024-02-02 12:50 ` patchwork-bot+netdevbpf
2024-10-15 7:39 [PATCH 0/4] pull request for net-next: batman-adv 2024-10-15 Simon Wunderlich
2024-10-15 7:39 ` [PATCH 1/4] batman-adv: Start new development cycle Simon Wunderlich
2024-10-15 13:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox