[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: use batadv_compare_eth when possible

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: use batadv_compare_eth when possible

[Sven Eckelmann]

From: Antonio Quartulli <a@unstable.cc>

When comparing Ethernet address it is better to use the more
generic batadv_compare_eth. The latter is also optimised for
architectures having a fast unaligned access.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Patch was resurrected from https://patchwork.open-mesh.org/patch/3668/

I've requested an rebased version at
https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014639.html
but done it myself because it was rather trivial.
---
 net/batman-adv/network-coding.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 32f9fa1..cbc667a 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -521,12 +521,10 @@ static bool batadv_nc_hash_compare(const struct hlist_node *node,
 	nc_path2 = data2;
 
 	/* Return 1 if the two keys are identical */
-	if (memcmp(nc_path1->prev_hop, nc_path2->prev_hop,
-		   sizeof(nc_path1->prev_hop)) != 0)
+	if (!batadv_compare_eth(nc_path1->prev_hop, nc_path2->prev_hop))
 		return false;
 
-	if (memcmp(nc_path1->next_hop, nc_path2->next_hop,
-		   sizeof(nc_path1->next_hop)) != 0)
+	if (!batadv_compare_eth(nc_path1->next_hop, nc_path2->next_hop))
 		return false;
 
 	return true;
-- 
2.7.0

[B.A.T.M.A.N.] [PATCH 2/2] batman-adv: fix debuginfo macro style issue

[Sven Eckelmann]

From: Simon Wunderlich <simon.wunderlich@open-mesh.com>

Structure initialization within the macros should follow the general
coding style used in the kernel: put the initialization of the first
variable and the closing brace on a separate line.

Reported-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Simon Wunderlich <simon.wunderlich@open-mesh.com>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Patch was resurrected from https://patchwork.open-mesh.org/patch/3769/

I've requested an rebased version at
https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014638.html
but done it myself because it was rather trivial.
---
 net/batman-adv/debugfs.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 3dc5208..9529004 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -365,14 +365,17 @@ static int batadv_nc_nodes_open(struct inode *inode, struct file *file)
 
 #define BATADV_DEBUGINFO(_name, _mode, _open)		\
 struct batadv_debuginfo batadv_debuginfo_##_name = {	\
-	.attr = { .name = __stringify(_name),		\
-		  .mode = _mode, },			\
-	.fops = { .owner = THIS_MODULE,			\
-		  .open = _open,			\
-		  .read	= seq_read,			\
-		  .llseek = seq_lseek,			\
-		  .release = single_release,		\
-		}					\
+	.attr = {					\
+		.name = __stringify(_name),		\
+		.mode = _mode,				\
+	},						\
+	.fops = {					\
+		.owner = THIS_MODULE,			\
+		.open = _open,				\
+		.read	= seq_read,			\
+		.llseek = seq_lseek,			\
+		.release = single_release,		\
+	},						\
 }
 
 /* the following attributes are general and therefore they will be directly
-- 
2.7.0

Re: [B.A.T.M.A.N.] [PATCH 1/2] batman-adv: use batadv_compare_eth when possible

[Marek Lindner]

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

On Friday, March 11, 2016 14:01:10 Sven Eckelmann wrote:
> From: Antonio Quartulli <a@unstable.cc>
> 
> When comparing Ethernet address it is better to use the more
> generic batadv_compare_eth. The latter is also optimised for
> architectures having a fast unaligned access.
> 
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> Patch was resurrected from https://patchwork.open-mesh.org/patch/3668/
> 
> I've requested an rebased version at
> https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014639.html
> but done it myself because it was rather trivial.
> ---
>  net/batman-adv/network-coding.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Applied in revision 6a1bc0a.

Thanks,
Marek

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

Re: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: fix debuginfo macro style issue

[Marek Lindner]

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

On Friday, March 11, 2016 14:01:11 Sven Eckelmann wrote:
> From: Simon Wunderlich <simon.wunderlich@open-mesh.com>
> 
> Structure initialization within the macros should follow the general
> coding style used in the kernel: put the initialization of the first
> variable and the closing brace on a separate line.
> 
> Reported-by: Antonio Quartulli <a@unstable.cc>
> Signed-off-by: Simon Wunderlich <simon.wunderlich@open-mesh.com>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> Patch was resurrected from https://patchwork.open-mesh.org/patch/3769/
> 
> I've requested an rebased version at
> https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014638.html
> but done it myself because it was rather trivial.
> ---
>  net/batman-adv/debugfs.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)

Applied in revision 2d34b55.

Thanks,
Marek

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