From a98b2f5a5ce5e78a434b34d3fdc1e10d54c4913f Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Mon, 11 Jul 2011 16:34:32 -0700 Subject: [PATCH 17/17] hostap: Fix up some global nl80211 struct usage. Patch really belongs in whatever patch caused the breakage, earlier in this series. Signed-off-by: Ben Greear --- :100644 100644 b71a137... cdbf571... M src/drivers/driver_nl80211.c src/drivers/driver_nl80211.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index b71a137..cdbf571 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -665,7 +665,7 @@ static unsigned int nl80211_get_assoc_freq(struct wpa_driver_nl80211_data *drv) if (!msg) goto nla_put_failure; - genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0, NLM_F_DUMP, + genlmsg_put(msg, 0, 0, genl_family_get_id(drv->global->nl80211), 0, NLM_F_DUMP, NL80211_CMD_GET_SCAN, 0); NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); @@ -6727,7 +6727,7 @@ static int nl80211_pmkid(struct i802_bss *bss, int cmd, const u8 *bssid, if (!msg) return -ENOMEM; - genlmsg_put(msg, 0, 0, genl_family_get_id(bss->drv->nl80211), 0, 0, + genlmsg_put(msg, 0, 0, genl_family_get_id(bss->drv->global->nl80211), 0, 0, cmd, 0); NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(bss->ifname)); -- 1.7.3.4