summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJeevan Shriram <jshriram@codeaurora.org>2016-03-15 12:16:16 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:24:21 -0700
commit643a1372494fcc2a5160e83360e178ca0c41f7bf (patch)
tree08f666c012118aaa02d3f4257fa9d72a5735f7f5 /net
parent28e3a4040ee49cd184a9868a11305fa7adb8f1d4 (diff)
net: initialize variables to avoid UML compilation failure
While compiling for usermode linux for x86 architecture, observed compilation issues with probable usage of uninitialized variables. This change initializes the variables. Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_trie.c2
-rw-r--r--net/netfilter/core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 744e5936c10d..3990ee077060 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1694,7 +1694,7 @@ struct fib_table *fib_trie_unmerge(struct fib_table *oldtb)
lt = (struct trie *)local_tb->tb_data;
while ((l = leaf_walk_rcu(&tp, key)) != NULL) {
- struct key_vector *local_l = NULL, *local_tp;
+ struct key_vector *local_l = NULL, *local_tp = NULL;
hlist_for_each_entry_rcu(fa, &l->leaf, fa_list) {
struct fib_alias *new_fa;
diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index f39276d1c2d7..67406d757001 100644
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -123,7 +123,7 @@ EXPORT_SYMBOL(nf_register_net_hook);
void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
{
struct list_head *hook_list;
- struct nf_hook_entry *entry;
+ struct nf_hook_entry *entry = NULL;
struct nf_hook_ops *elem;
hook_list = nf_find_hook_list(net, reg);