From 1033315fbe4e929df479249c8ef38abab5216316 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 20 Dec 2014 15:45:28 +0200 Subject: [PATCH] nl80211: Remove send_and_recv_msgs_global() wrapper There was only a single user for this and calling send_and_recv() directly is as simple as using this wrapper. Signed-off-by: Jouni Malinen --- src/drivers/driver_nl80211.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index dfdb943fd..089484960 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -324,16 +324,6 @@ static int send_and_recv(struct nl80211_global *global, } -static int send_and_recv_msgs_global(struct nl80211_global *global, - struct nl_msg *msg, - int (*valid_handler)(struct nl_msg *, void *), - void *valid_data) -{ - return send_and_recv(global, global->nl, msg, valid_handler, - valid_data); -} - - int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, struct nl_msg *msg, int (*valid_handler)(struct nl_msg *, void *), @@ -398,7 +388,7 @@ static int nl_get_multicast_id(struct nl80211_global *global, return -1; } - ret = send_and_recv_msgs_global(global, msg, family_handler, &res); + ret = send_and_recv(global, global->nl, msg, family_handler, &res); if (ret == 0) ret = res.id; return ret;