linux-merge

linux-merge@lists.open-mesh.org

2 participants
7453 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20110624
by batman＠open-mesh.org 24 Jun '11

24 Jun '11

The following commit has been merged in the master branch: commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 20 10:32:03 2010 -0800 batman-adv: Return hna count on local buffer fill hna_local_fill_buffer must return the number of added hna entries and not the last checked hash bucket. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a19e16c..a633b5a4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -162,7 +162,7 @@ int hna_local_fill_buffer(struct bat_priv *bat_priv, atomic_set(&bat_priv->hna_local_changed, 0); spin_unlock_bh(&bat_priv->hna_lhash_lock); - return i; + return count; } int hna_local_seq_print_text(struct seq_file *seq, void *offset) -- LinuxNextTracking

1 0

Failed check next types.h
by postmaster＠open-mesh.org 24 Jun '11

24 Jun '11

ERROR: need consistent spacing around '*' (ctx:WxV) #70: FILE: types.h:70: + struct neigh_node __rcu *router; /* rcu protected pointer */ ^ ERROR: need consistent spacing around '*' (ctx:WxV) #203: FILE: types.h:203: + struct gw_node __rcu *curr_gw; /* rcu protected pointer */ ^ ERROR: need consistent spacing around '*' (ctx:WxV) #205: FILE: types.h:205: + struct hard_iface __rcu *primary_if; /* rcu protected pointer */ ^ ERROR: need consistent spacing around '*' (ctx:WxV) #332: FILE: types.h:332: + struct softif_neigh __rcu *softif_neigh; ^ total: 4 errors, 0 warnings, 0 checks, 345 lines checked types.h has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

Failed check master types.h
by postmaster＠open-mesh.org 24 Jun '11

24 Jun '11

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge