Drop repeated words in net/batman-adv/.
Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org
net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/fragmentation.c | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/network-coding.c | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/soft-interface.c | 4 ++-- net/batman-adv/types.h | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-)
Drop the repeated word "function".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/bridge_loop_avoidance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/bridge_loop_avoidance.c +++ linux-next-20200731/net/batman-adv/bridge_loop_avoidance.c @@ -1795,7 +1795,7 @@ batadv_bla_loopdetect_check(struct batad
ret = queue_work(batadv_event_workqueue, &backbone_gw->report_work);
- /* backbone_gw is unreferenced in the report work function function + /* backbone_gw is unreferenced in the report work function * if queue_work() call was successful */ if (!ret)
Drop the repeated word "not".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/fragmentation.c +++ linux-next-20200731/net/batman-adv/fragmentation.c @@ -306,7 +306,7 @@ free: * set *skb to merged packet; 2) Packet is buffered: Return true and set *skb * to NULL; 3) Error: Return false and free skb. * - * Return: true when the packet is merged or buffered, false when skb is not not + * Return: true when the packet is merged or buffered, false when skb is not * used. */ bool batadv_frag_skb_buffer(struct sk_buff **skb,
Drop the repeated word "table". End a sentence with a period.
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/hard-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/hard-interface.c +++ linux-next-20200731/net/batman-adv/hard-interface.c @@ -599,7 +599,7 @@ out: /* report to the other components the maximum amount of bytes that * batman-adv can send over the wire (without considering the payload * overhead). For example, this value is used by TT to compute the - * maximum local table table size + * maximum local table size. */ atomic_set(&bat_priv->packet_size_max, min_mtu);
Drop the repeated word "multicast".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/multicast.c +++ linux-next-20200731/net/batman-adv/multicast.c @@ -207,7 +207,7 @@ static u8 batadv_mcast_mla_rtr_flags_bri return BATADV_MCAST_WANT_NO_RTR4 | BATADV_MCAST_WANT_NO_RTR6;
/* TODO: ask the bridge if a multicast router is present (the bridge - * is capable of performing proper RFC4286 multicast multicast router + * is capable of performing proper RFC4286 multicast router * discovery) instead of searching for a ff02::2 listener here */ ret = br_multicast_list_adjacent(dev, &bridge_mcast_list);
Change "is is" to "it is".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/network-coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/network-coding.c +++ linux-next-20200731/net/batman-adv/network-coding.c @@ -250,7 +250,7 @@ static void batadv_nc_path_put(struct ba /** * batadv_nc_packet_free() - frees nc packet * @nc_packet: the nc packet to free - * @dropped: whether the packet is freed because is is dropped + * @dropped: whether the packet is freed because it is dropped */ static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet, bool dropped)
Change "is is" to "it is".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20200731.orig/net/batman-adv/send.c +++ linux-next-20200731/net/batman-adv/send.c @@ -461,7 +461,7 @@ int batadv_send_skb_via_gw(struct batadv /** * batadv_forw_packet_free() - free a forwarding packet * @forw_packet: The packet to free - * @dropped: whether the packet is freed because is is dropped + * @dropped: whether the packet is freed because it is dropped * * This frees a forwarding packet and releases any resources it might * have claimed.
Drop the repeated word "the" in two places.
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/soft-interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20200731.orig/net/batman-adv/soft-interface.c +++ linux-next-20200731/net/batman-adv/soft-interface.c @@ -649,7 +649,7 @@ static void batadv_softif_destroy_vlan(s /** * batadv_interface_add_vid() - ndo_add_vid API implementation * @dev: the netdev of the mesh interface - * @proto: protocol of the the vlan id + * @proto: protocol of the vlan id * @vid: identifier of the new vlan * * Set up all the internal structures for handling the new vlan on top of the @@ -707,7 +707,7 @@ static int batadv_interface_add_vid(stru /** * batadv_interface_kill_vid() - ndo_kill_vid API implementation * @dev: the netdev of the mesh interface - * @proto: protocol of the the vlan id + * @proto: protocol of the vlan id * @vid: identifier of the deleted vlan * * Destroy all the internal structures used to handle the vlan identified by vid
Drop the repeated words "time" and "address".
Signed-off-by: Randy Dunlap rdunlap@infradead.org Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli a@unstable.cc Cc: Sven Eckelmann sven@narfation.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org --- net/batman-adv/types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20200731.orig/net/batman-adv/types.h +++ linux-next-20200731/net/batman-adv/types.h @@ -1492,7 +1492,7 @@ struct batadv_tp_vars { /** @unacked_lock: protect unacked_list */ spinlock_t unacked_lock;
- /** @last_recv_time: time time (jiffies) a msg was received */ + /** @last_recv_time: time (jiffies) a msg was received */ unsigned long last_recv_time;
/** @refcount: number of context where the object is used */ @@ -1996,7 +1996,7 @@ struct batadv_tt_change_node { */ struct batadv_tt_req_node { /** - * @addr: mac address address of the originator this request was sent to + * @addr: mac address of the originator this request was sent to */ u8 addr[ETH_ALEN];
On Sunday, 23 August 2020 01:13:27 CEST Randy Dunlap wrote:
Drop repeated words in net/batman-adv/.
Please rebase to only contain the changes not yet in https://git.open-mesh.org/linux-merge.git/shortlog/refs/heads/batadv/net-nex...
Kind regards, Sven
On 8/22/20 10:49 PM, Sven Eckelmann wrote:
On Sunday, 23 August 2020 01:13:27 CEST Randy Dunlap wrote:
Drop repeated words in net/batman-adv/.
Please rebase to only contain the changes not yet in https://git.open-mesh.org/linux-merge.git/shortlog/refs/heads/batadv/net-nex...
Kind regards, Sven
Ah, I think that you have everything covered already. Glad to see it.
Is this git tree included in linux-next?
thanks.
On Sunday, 23 August 2020 08:05:10 CEST Randy Dunlap wrote: [...]
Please rebase to only contain the changes not yet in https://git.open-mesh.org/linux-merge.git/shortlog/refs/heads/batadv/net-nex...
[...]
Is this git tree included in linux-next?
No, Stephen Rothwell isn't including the batadv/net + batadv/net-next branches of this tree [1] directly - only the netdev trees are included. And the batadv specific branches were not yet submitted for inclusion after net-next reopened [2] after -rc1.
Kind regards, Sven
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/MAIN... [2] https://lore.kernel.org/netdev/20200818.002258.232165702420264020.davem@dave...
From: Randy Dunlap rdunlap@infradead.org Date: Sat, 22 Aug 2020 16:13:27 -0700
Drop repeated words in net/batman-adv/.
I'll let the batman-adv folks integrate this series.
b.a.t.m.a.n@lists.open-mesh.org