b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH v2 0/4] Broadcast Avoidances, Neighborhood Hash
Date: Wed, 14 Dec 2016 15:49:32 +0100	[thread overview]
Message-ID: <1682263.buGhbnabNv@bentobox> (raw)
In-Reply-To: <20161006064142.20003-1-linus.luessing@c0d3.blue>

[-- Attachment #1: Type: text/plain, Size: 3786 bytes --]

On Donnerstag, 6. Oktober 2016 08:41:37 CET Linus Lüssing wrote:
> Hi,
> 
> Here's the second broadcast avoidance patchset (rebased on the former one).
> 
> Hopefully, those two patchsets together should be an automatic
> approach and replacement for the (non-upstream) no-rebroadcast flag
> patch and the cases it is currently used for.

All patches had conflicts when I tried to apply them. Please check if the branch ecsv/pu [1] solved the conflicts correctly.

Here are the conflicts (according to rerere diff):

Patch 1
=======

    --- a/net/batman-adv/originator.c
    +++ b/net/batman-adv/originator.c
    @@ -559,11 +559,8 @@
     			   struct batadv_orig_node *orig_node)
     {
     	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
    -<<<<<<<
    -	struct batadv_hardif_neigh_node *hardif_neigh = NULL, *pre_neigh;
    -=======
     	struct batadv_hardif_neigh_node *hardif_neigh;
    ->>>>>>>
    +	struct batadv_hardif_neigh_node *pre_neigh;
     
     	spin_lock_bh(&hard_iface->neigh_list_lock);
 


Patch 2
=======

    --- a/net/batman-adv/Kconfig
    +++ b/net/batman-adv/Kconfig
    @@ -17,12 +17,8 @@
     
     config BATMAN_ADV_BATMAN_V
     	bool "B.A.T.M.A.N. V protocol (experimental)"
    -<<<<<<<
     	depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
    -=======
    -	depends on BATMAN_ADV && CFG80211=y || (CFG80211=m && BATMAN_ADV=m)
     	select CRYPTO_SHA512
    ->>>>>>>
     	default n
     	help
     	  This option enables the B.A.T.M.A.N. V protocol, the successor



Patch 3
=======

    --- a/net/batman-adv/bat_iv_ogm.c
    +++ b/net/batman-adv/bat_iv_ogm.c
    @@ -1852,22 +1852,17 @@
     		skb_set_network_header(skb, ogm_offset);
     	}
     
    -<<<<<<<
     	ret = NET_RX_SUCCESS;
     
     free_skb:
    +	skb_reset_network_header(skb);
    +
     	if (ret == NET_RX_SUCCESS)
     		consume_skb(skb);
     	else
     		kfree_skb(skb);
     
     	return ret;
    -=======
    -	skb_reset_network_header(skb);
    -
    -	kfree_skb(skb);
    -	return NET_RX_SUCCESS;
    ->>>>>>>
     }
     
     #ifdef CONFIG_BATMAN_ADV_DEBUGFS
    --- a/net/batman-adv/multicast.c
    +++ b/net/batman-adv/multicast.c
    @@ -1173,21 +1173,15 @@
      */
     void batadv_mcast_init(struct batadv_priv *bat_priv)
     {
    -<<<<<<<
    -	batadv_tvlv_handler_register(bat_priv, batadv_mcast_tvlv_ogm_handler,
    -				     NULL, BATADV_TVLV_MCAST, 2,
    -				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);
    -
    -	INIT_DELAYED_WORK(&bat_priv->mcast.work, batadv_mcast_mla_update);
    -	batadv_mcast_start_timer(bat_priv);
    -=======
     	batadv_tvlv_handler_register2(bat_priv, batadv_mcast_tvlv_ogm_handler,
     				      BATADV_IV_OGM, BATADV_TVLV_MCAST, 2,
     				      BATADV_TVLV_HANDLER_CIFNOTFND);
     	batadv_tvlv_handler_register2(bat_priv, batadv_mcast_tvlv_ogm_handler,
     				      BATADV_OGM2, BATADV_TVLV_MCAST, 2,
     				      BATADV_TVLV_HANDLER_CIFNOTFND);
    ->>>>>>>
    +
    +	INIT_DELAYED_WORK(&bat_priv->mcast.work, batadv_mcast_mla_update);
    +	batadv_mcast_start_timer(bat_priv);
     }
     
     #ifdef CONFIG_BATMAN_ADV_DEBUGFS



Patch 4
=======

    --- a/net/batman-adv/send.c
    +++ b/net/batman-adv/send.c
    @@ -797,11 +797,6 @@
     	unsigned long send_time = jiffies + msecs_to_jiffies(5);
     	bool dropped = false;
     	u8 *neigh_addr;
    -<<<<<<<
    -	u8 *orig_neigh;
    -=======
    -	unsigned long send_time = jiffies + msecs_to_jiffies(5);
    ->>>>>>>
     	int ret = 0;
     
     	delayed_work = to_delayed_work(work);



Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/ecsv/pu

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      parent reply	other threads:[~2016-12-14 14:49 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-06  6:41 [B.A.T.M.A.N.] [PATCH v2 0/4] Broadcast Avoidances, Neighborhood Hash Linus Lüssing
2016-10-06  6:41 ` [B.A.T.M.A.N.] [PATCH v2 1/4] batman-adv: Keep hard interface neighbor list sorted Linus Lüssing
2016-12-14 18:48   ` Sven Eckelmann
2016-12-14 19:23     ` Sven Eckelmann
2017-01-28  3:13       ` Linus Lüssing
2017-01-28  3:40         ` Linus Lüssing
2017-01-28  9:07           ` Sven Eckelmann
2016-10-06  6:41 ` [B.A.T.M.A.N.] [PATCH v2 2/4] batman-adv: Store and transmit own neighborhood hash Linus Lüssing
2016-12-14 20:28   ` Sven Eckelmann
2016-12-19 13:32     ` Linus Lüssing
2016-12-14 20:49   ` Sven Eckelmann
2016-12-14 20:57   ` Sven Eckelmann
2016-10-06  6:41 ` [B.A.T.M.A.N.] [PATCH v2 3/4] batman-adv: Introduce packet type independent TVLV handler API Linus Lüssing
2016-12-14 14:50   ` Sven Eckelmann
2016-12-19 10:29     ` Linus Lüssing
2017-01-22 12:40       ` Sven Eckelmann
2016-12-14 20:03   ` Sven Eckelmann
2016-12-14 20:12     ` Sven Eckelmann
2016-12-19 10:50       ` Linus Lüssing
2016-12-19 11:37         ` Sven Eckelmann
2016-12-19 11:43           ` Sven Eckelmann
2016-12-20 11:55             ` Linus Lüssing
2017-01-22 12:51               ` Sven Eckelmann
2016-10-06  6:41 ` [B.A.T.M.A.N.] [PATCH v2 4/4] batman-adv: Evaluate and use neighborhood hash TVLV Linus Lüssing
2016-12-14 14:49 ` Sven Eckelmann [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1682263.buGhbnabNv@bentobox \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).