commit 2a51ec8dd7e128899b8b7ecf8d8d4c38e6077bdd
author Dmitry Shmidt <dimitrysh@google.com> Fri Sep 30 14:21:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 30 14:21:04 2011 -0700
tree c10c8148beb8b3d16023f34569af6146551eaee8
parent 334ea78110a8329703119726c7031aa33e7aa87d
parent e5de9ee4915bafd7f31a96260613d8b93aba8351

am e5de9ee4: libnl_2: Fix getting family_id

* commit 'e5de9ee4915bafd7f31a96260613d8b93aba8351':
  libnl_2: Fix getting family_id

libnl_2/genl/genl.c

diff --git a/libnl_2/genl/genl.c b/libnl_2/genl/genl.c
index dd20717..2442993 100644
--- a/libnl_2/genl/genl.c
+++ b/libnl_2/genl/genl.c
@@ -112,6 +112,7 @@
 	nlmhdr.nlmsg_pid = sock->s_local.nl_pid;
 
 	/* Generic netlink header */
+	memset(&gmhhdr, 0, sizeof(gmhhdr));
 	gmhhdr.cmd = CTRL_CMD_GETFAMILY;
 	gmhhdr.version = CTRL_ATTR_FAMILY_ID;
 
@@ -221,9 +222,11 @@
 
 				/* Save the family id */
 				else if (nl80211_flag &&
-					nla->nla_type == CTRL_ATTR_FAMILY_ID)
-					nl80211_genl_id = \
+					nla->nla_type == CTRL_ATTR_FAMILY_ID) {
+					nl80211_genl_id =
 						*((int *)nla_data(nla));
+					nl80211_flag = 0;
+				}
 
 			}