From: Jakub Kicinski Date: Fri, 17 Mar 2023 23:29:25 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1118aa4c70a6978afb0c4391ad29826c14b842b3;p=linux.git Merge git://git./linux/kernel/git/netdev/net net/wireless/nl80211.c b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy") cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW timestamping") https://lore.kernel.org/all/20230314105421.3608efae@canb.auug.org.au tools/testing/selftests/net/Makefile 62199e3f1658 ("selftests: net: Add VXLAN MDB test") 13715acf8ab5 ("selftest: Add test for bind() conflicts.") Signed-off-by: Jakub Kicinski --- 1118aa4c70a6978afb0c4391ad29826c14b842b3 diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c index 644c889f9a32b,f1de152a61135..d39c3476b6d14 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@@ -1798,10 -1794,8 +1799,9 @@@ static void remove_one(struct pci_dev * * fw_reset before unregistering the devlink. */ mlx5_drain_fw_reset(dev); - set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state); devlink_unregister(devlink); mlx5_sriov_disable(pdev); + mlx5_thermal_uninit(dev); mlx5_crdump_disable(dev); mlx5_drain_health_wq(dev); mlx5_uninit_one(dev); diff --cc net/wireless/nl80211.c index 0a31b1d2845d5,4f63059efd813..bfa15defc04e9 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@@ -805,10 -810,8 +810,11 @@@ static const struct nla_policy nl80211_ [NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN), [NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG }, [NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT }, - [NL80211_ATTR_PUNCT_BITMAP] = NLA_POLICY_RANGE(NLA_U8, 0, 0xffff), + [NL80211_ATTR_PUNCT_BITMAP] = + NLA_POLICY_FULL_RANGE(NLA_U32, &nl80211_punct_bitmap_range), + + [NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS] = { .type = NLA_U16 }, + [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG }, }; /* policy for the key attributes */ diff --cc tools/testing/selftests/net/Makefile index a179fbd6f9721,80fbfe0330f6e..e57750e44f718 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@@ -81,7 -80,7 +81,8 @@@ TEST_GEN_FILES += sctp_hell TEST_GEN_FILES += csum TEST_GEN_FILES += nat6to4.o TEST_GEN_FILES += ip_local_port_range + TEST_GEN_FILES += bind_wildcard +TEST_PROGS += test_vxlan_mdb.sh TEST_FILES := settings