Cumulative patch from upstream commit 5909e73

5909e73 iw: survey: add support for radio stats
7e06706 iw: event: report missing radar events
d034d73 bump version to 5.16
4624220 info: add FILS_CRYPTO_OFFLOAD extended feature
b8d5974 update nl80211.h
8614608 iw: print BSS coloring capability if supported
ba4f75b iw: add set sar_specs command
50918cb iw: nl80211: add NLA_F_NESTED to nla_nest_start() with older libnl versions
5a29126 iw: mesh: add comments in the mesh confguration parameter printing sections
e848afe iw: event: add the missing time display format in the "iw event" help menu
25bb9c3 iw: link: mention the need for MAC addr arg in link get_sta cmd usage menu
f71bd68 iw: fix vendor event static warnings
3d3d8fc iw: fix various sparse static warnings
24fb155 iw: make parse_he_gi static
bfc4a63 iw: add support for configuring the bss color for ranging measurements
e0f0ee3 iw: update nl80211.h
0ed91f5 iw: use cipher suite defines in util.c
d893e72 iw: add cipher suites definitions
a6cedc6 iw: unify interface type list printing
d59e908 iw: mesh: add new cmd to dump all the supported mesh config params at once
87728df iw: mesh: fix crash when attempting to print the conf param "mesh_nolearn"
3307775 iw: ps: fix "get power_save" documentation
a0f53c1 iw: add option to set auth type for connect
c9e7d27 update nl80211.h
1325244 iw: allow specifying CFLAGS/LIBS externally
8fab0c9 iw: fix ftm_request missing arguments segfault
e816fbc iw: fix mgmt dump missing arguments segfault
5d9d1b8 iw: Fix timestamp output on 32-bit architectures
4b25ae3 iw: fix pointer arithmetic in __print_he_capa
c3df363 iw: add option to print human readable event time
cd64525 iw: print ctrl port tx status event
0ba98b9 iw: use correct type in policy check for mesh
9e38dee iw: scan: fixup HE caps whitespace
17e8564 iw: scan: parse HE capabilities
5735e58 iw: util: factor out HE capability parser
6d8d507 iw: scan: add extension tag parsing
b4e1ec4 man: update wikipage URL, reformat SEE ALSO section
c56036a iw: enable 80MHz support for 6GHz band 11s mesh
fa72728 iw: handle positive error codes gracefully
7ba9093 iw: scan: add flag for scanning colocated ap
5ec60ed iw: Add 'coloc' and 'flush' options to sched_scan
f8ade75 iw: update wikipage URL
b6f2dac iw: Add support for specifying the 160MHz bandwidth when setting the channel/frequency
8934cc4 bump version to 5.9
562404c iw: support HE rate configuration in 6 GHz band
3071b52 iw: add HE rate/gi/ltf support
5864fa5 iw: update nl80211.h
4d2749a iw: add TID specific Tx bitrate configuration
e90b693 iw: fix tid config help entries
49831d0 bump version to 5.8
8b159da iw: print hop_count and path_change info of mpath
700f7d9 iw: handle more mesh station info
0789fd2 iw: handle all mesh config parameters
06e9839 iw: print current ext feature set
e0a45db update nl80211.h to 5.8-rc1
8e58fe9 iw: add support for vendor events
125abec iw: add support for NDP ranging - trigger based and non trigger based
b3999a3 reg: Fix getting PHY specific regulatory information
b12fc8a iw: update freq to chan mappings for 6GHz band per IEEE P802.11ax/D6.1
94ded88 iw: mesh: add mesh_param "mesh_nolearn" to skip path discovery
f718f11 update nl80211.h
8e7cd59 iw: print current ext feature set
e9d87a7 update nl80211.h
4378919 iw: sync frequency to channel mapping with kernel for 6GHz band
71ad41c iw: add TID specific configuration command
d2a29c0 update nl80211.h
10b9b03 iw: Print limit for maximum associated stations in AP mode
83689ee iw: 'phy <name> reg get' shouldn't dump all domains
88f9e98 iw: tiny code style fixes
19b80cd iw: event: log rssi value for cqm
0250318 iw: event: also handle reg change on wiphy
ec9f3e7 iw: update extended features in info
05157b1 iw: Complete Extended Key ID detection
cb07eab iw: update nl80211.h
11c35ae iw: phy: dump wiphy index
08d7c40 scan: Fix printing of unknown WPS vendor extension
71340cd iw: correctly print signed TX power level
715cd40 resync nl80211.h
7d36556 scan: wps: remove useless string length checks
ff32636 scan: wps: fix some misplaced code
fe969ad iw: scan: parse AP Channel Report
f395f75 iw: scan: parse wps version2
84289c0 scan: wps: add more bounds checks
7be767c iw: scan: better length checks in print_wifi_wps()
6e0ce46 iw: scan: fix some format string warnings found by clang
a7375d5 iw: scan: fix undefined behaviour in print_vht_capa()
22145cf iw: scan: fix undefined behaviour in rm capa print
505f9e4 iw: scan: fix buffer over-read in print_p2p
e4ebc46 iw: scan: fix buffer over-read in print_wifi_wps
baea1a0 iw: scan: fix buffer over-read in parsing roaming consortium
cb13b9d iw: scan: fix buffer over-read in print_ies()
7d8fcdc build: add -Wdeclaration-after-statement
0e6d544 iw: scan: parse measurement pilot element
2dfd1f0 iw: scan: parse tx power envelope
3d34360 iw: scan: parse 'supported Operating Classes element'
a532a81 iw: scan: add missing word for rm capabilities
ad5bd08 iw: reg: parse the NO_HE regulatory flag
97dd4da iw: print ru-alloc values when dumping stations
ba300c3 update nl80211.h
4d72d1d iw: scan: print radio measurement capabilities
bb391d2 iw: event: parse channel switch
b31864b iw: info: add missing extended flags for 5.5
ce87a25 iw: event: parse stop ap and frame wait cancel events
51bfd5a iw: event: handle interface add/del
e9b5958 iw: update nl80211.h
a39d32a iw: info: print missing extended feature flag information
68257d0 event: remove unnecessary braces
47650ff iw: event: add sta opmode changed command
7d17ba9 iw: event: add set interface command
d98f794 iw: event: add new peer candidate command
d5b145c iw: bump version to 5.4
8e322f8 iw: scan: fix double-free in error paths
68dd562 iw: Fix typo in iw --help
3708f61 iw: Print current time in station info dump
0b39c40 iw: Support associated-at station statistic.
0c1a26b update nl80211.h
959fa3b bump version to 5.3
b5c0c33 info: update extended feature list
02b53ea info: macro-ify ext_feat_print()
732c1aa util: update command list
a0c07e4 update nl80211.h
08c3f7d iw: scan: add missing newline
c741be9 iw: print HE capabilities
35a458a iw: really fix build
848d97d iw: add HE support to station dump call
71e6d18 cac: fix error handling in channel parsing
4fadb60 nan: fix memory leak
1ea6085 mesh: initialize err in set_interface_meshparam()
fc38d3e iw: fix fp handling inside handle_vendor
2f74c59 iw: fix memory leaks inside handle_scan
edb5f4f iw: fix memory leak inside parse_sched_scan
3a51540 iw: fix fd leak inside handle_netns
6a7cc86 iw: fix memory leak inside handle_cac
2f31605 iw: fix endless loop inside handle_mgmt_dump
0b41c3b iw: fix memory leak inside register_mgmt_frame
f46aab4 iw: add version.o to objects
f561cfc iw: include all C files into the binary
338059a iw: change __cmd section scheme to fit gcc/clang
5bdf11e iw: Add support for controlling tx power for per station
24091b7 iw: add command to inject a frame via direct mesh link to mesh peer
2c8026d update nl80211.h
e99bc38 iw: print 4ADDR attribute when dumping interface
4323f5a iw: small cleanup for the sizer code
ae03bc6 iw: fix cmd_size determination with LTO
691c585 update nl80211.h
5c0784d iw: Print airtime fairness feature
8290324 iw: Add command to set airtime weight
a85d693 iw: Add printing of station tx duration and airtime weight
1b0f808 iw: bump version to 5.0.1
6439859 iw: make it build with older compilers again
311c9f2 iw: bump version to 5.0
02b85d8 iw: add FTM responder commands
8ddb960 iw: add FTM initiator support
2e192ce iw: separate wait/print when waiting for an event
3c0117c iw: make parse_random_mac_addr() more generally available
806bb9a update nl80211.h and command list
687eeb3 iw: make all code files non-executable
9b2849e iw: add FEATURE support for scan randomization
5c01d5a iw: dump 'rx bitrate' in link stats
77bbbf1 iw: use -Wstringop-overflow=4
02bc775 iw: honor CPPFLAGS when compiling
adfc102 iw: Fix NAN match event formatting
ed3552e iw: nan: fix warning of uninitialized variable
572aae9 remove stray evp.h include
63d6aac iw: nan: Add NAN Commands
7c4e86c iw: nan: Handle NAN Events
084184e iw: Add inactivity timeout configuration support
b7e8163 wowlan: Use MAX_NL80211_ATTR instead of NUM in nla_parse
0e39f10 connect: fix parsing of WEP keys
d4f1ea1 connect: Fix parsing of PSK
bcdceae iw: fix various static checker warnings
fc16607 iw: scan: parse OWE Transition Mode element
7f87d3c iw: Make input to mac_addr_n2a() const
a58f492 scan: Decode additional Authentication types
befb32d iw: fix enum warnings
0fc9283 iw: fix the beacon average signal parsing
d227267 iw: ack signal support for tx ack packets
c8edf8f scan: fix fall through warning
75b78ff update nl80211.h
c9c3b69 scan: fix indentation in previous change
86d907a scan: fix crash when driver doesn't report frame type
8a2dfd5 iw: 'idby' might be used uninitialized in main function
6ab936f iw: enable -Wextra and fix warnings caused by it
b50d145 scan: print out "Information elements from Probe Response frame" only if certain
f3c9666 iw: fix some scan code indentation
1eb2f5c iw: Add getting and setting of TXQ params for phy
910792c iw: Print TXQ statistics for stations and interfaces
7110108 update nl80211.h
56e36b2 iw: support reloading the regulatory database
3a99ff6 iw: Add duration parameter to scan command
c1bdfe6 iw: add printout of all supported ext_features to phy info
e06485e iw: update nl80211.h
f328848 bump version to 4.14
45de060 update nl80211.h
378286c util: update command list
f750458 ocb: Use common freqchan helper for setting the operating channel
86dbcee iw: add support for mfp
c91fdbe iw: ap: don't return -EPERM
ab50848 iw: ap: support hidden/zeroed SSID
26cab67 iw: ap: add support for passing a proper chandef
60b6c63 iw: Add support for start/stop AP
5f310d8 iw: print missing extended capabilities
d792470 iw: allow CCMP-128/GCMP-128 as CCMP/GCMP aliases
6c2a012 iw: add support for WPA2 PSK CCMP / GCMP association
7e0a7c4 update nl80211.h
48e0a01 iw: add command to register and dump mgmt frames
86da57a iw: define SOL_NETLINK if it isn't
3a80732 iw: add extack support
8a9e0b3 update nl80211.h
5ce1f6c iw: Fix bitrate output when no rate info found
4871fcf iw: parse_freqs: check how many center frequencies to expect
c37f6c6 iw: split str_to_bw() from parse_freqs()
03fb59d Print frequency of radar events.
444674c Add commands to send CSA
2ba2f59 Add cac command to allow clearing channels
3e1debe mesh: Use common freqchan helper for joining a mesh
2b8047a ibss: Use common freqchan helper for joining an ibss
159d5e4 phy: Use common freqchan helper for setting the operating channel
997c60f util: Add generic frequency/channel command line handler
f13627c update version to 4.9
ed9b77e iw: nan: Add NAN interface type
386bacb iw: add support for VHT MU-MIMO air sniffer
2781d64 add new commands
4d17e34 ibss: remove _POSIX_SOURCE
a574be4 update nl80211.h (kernel 4.9)
27ea56b event: handle NL80211_ATTR_TIMED_OUT in connect event
0a12cf8 iw: add scan-abort command
9ad3cc2 utils: make hex2byte and hex2bin parameter const
432b5ae iw: display 5/10 MHz channel widths
b0c5a4a iw: recognize 256-bit cipher suites
db9d405 add "channels" PHY command listing frequencies with more details
feea0ff iw: bump version to 4.7
26e074a iw: version.sh: update to get version with git correctly
8ccc479 iw: Fix -Wabsolute-value compiler warning in iw.c
d738686 iw: support setting frame subtype and reason code when deleting station
e7c0923 iw: add vendor command response support
045c1c6 iw: Add support for NL80211_STA_INFO_RX_DURATION netlink attribute
7687d59 iw: Change socket configuration to avoid buffer allocation error
f45d458 update nl80211.h
9ae0d10 iw: add scheduled scan plans configuration
568c705 iw: add missing station statistics
b2c4bf4 iw: document handler return value 1 as HANDLER_RET_USAGE
94af668 iw: fix "iw reg get" double output
f6fca12 print BSS boottime if received
478438c update nl80211.h
8366d19 iw: print NOHT always as first in usage texts
1029a54 iw: use get_cf1 and struct chanmode for ocb
e7271e7 iw: add VHT80 support for 802.11s
c1b2b63 iw: prepare get_cf1 for use in join_* functions
96fa73c iw: don't use NULL pointer in nla_nest_end()
ab65a09 iw: Fix memory leak if nla_put fails
33cbe6c mesh: show mesh parameters when no args are given
f755a22 iw: remove superfluous includes
7082f96 iw: Fix segfault when no args are given to offchannel
0ee571d iw: add and fix -Wsign-compare
ef65e9c iw: fix help text for event command
6cd3634 iw: add helpful hints for vendor cmd
f0dff70 ocb: use correct "MHz" instead of "MHZ"
86a9801 iw: Fix return values when parameters are wrong
24cc1cf iw: Fix memory leak in error path
5f17068 iw: remove superfluous includes
7187aad ibss: use correct "MHz" instead of "MHZ"
faeef83 ibss: add VHT80 support for IBSS
d06cda9 scan: Add FTM info to scan results
619d28a iw: display interface TX power if available
5d290c8 bump version to 4.3
516ef62 iw: fix off-by-one
8823f67 add a few new commands/events
a723a10 print IR-concurrent instead of GO-concurrent
5c83c0e update nl80211.h to kernel 4.3
7d19e35 iw: don't mix declaration into code
c0441e6 iw: make netns_get_fd static
7faa1ba iw: fix s_cb leak
572e47a iw: avoid passing NULL to nla_data()
8b80a2b iw: cqm: check nlmsg_alloc() return
63e11c4 iw: remove android-nl.c with unneeded workaround
74c7449 iw: fix references to libnl in Android.mk
367e7dd iw: free memory on scan parse errors
34b2301 iw: remove cb from arguments and simplify valid handler

Bug: 206715716
Test: Manual - Wifi ON/OFF - executed iw commands
Change-Id: Ia743f040e222602bb8eb047366ccc5b41710736a

1 files changed, 2 insertions, 5 deletions

diff --git a/mpp.c b/mpp.c
index 2d20d6b..58bf28e 100644
--- a/mpp.c
+++ b/mpp.c
@@ -1,6 +1,5 @@
 #include <net/if.h>
 #include <errno.h>
-#include <string.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -37,7 +36,6 @@ static int print_mpp_handler(struct nl_msg *msg, void *arg)
 }
 
 static int handle_mpp_get(struct nl80211_state *state,
-			  struct nl_cb *cb,
 			  struct nl_msg *msg,
 			  int argc, char **argv,
 			  enum id_input id)
@@ -59,7 +57,7 @@ static int handle_mpp_get(struct nl80211_state *state,
 
 	NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, dst);
 
-	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpp_handler, NULL);
+	register_handler(print_mpp_handler, NULL);
 
 	return 0;
  nla_put_failure:
@@ -70,13 +68,12 @@ COMMAND(mpp, get, "<MAC address>",
 	"Get information on mesh proxy path to the given node.");
 
 static int handle_mpp_dump(struct nl80211_state *state,
-			     struct nl_cb *cb,
 			     struct nl_msg *msg,
 			     int argc, char **argv,
 			     enum id_input id)
 {
 	printf("DEST ADDR         PROXY NODE        IFACE\n");
-	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_mpp_handler, NULL);
+	register_handler(print_mpp_handler, NULL);
 	return 0;
 }
 COMMAND(mpp, dump, NULL,