git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
net
/
batman-adv
/
translation-table.c
diff --git
a/net/batman-adv/translation-table.c
b/net/batman-adv/translation-table.c
index
a19e16c
..
a633b5a
100644
(file)
--- 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)