From 5ab47c085c07865813b1bf4e2ca09cbbc7629e5a Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 21 Apr 2021 18:39:52 +0000 Subject: [PATCH] ANDROID: Revert "net: wireless: Add module_param(mac_prefix) to mac80211_hwsim" This reverts commit 21afbdd8086d682471fda5d3f4bb59296c2486cb. Reason for revert: This was a workaround we don't need anymore Bug: 150388981 Change-Id: Ia9fb3dd9c4ac7ff819e16f2ebe2f21e8b31bad30 Signed-off-by: Roman Kiryanov --- drivers/net/wireless/mac80211_hwsim.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index e1baeea85b44..fa7d4c20dc13 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -65,10 +65,6 @@ static bool support_p2p_device = true; module_param(support_p2p_device, bool, 0444); MODULE_PARM_DESC(support_p2p_device, "Support P2P-Device interface type"); -static ushort mac_prefix; -module_param(mac_prefix, ushort, 0444); -MODULE_PARM_DESC(mac_prefix, "Second and third most significant octets in MAC"); - /** * enum hwsim_regtest - the type of regulatory tests we offer * @@ -3072,8 +3068,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, if (!param->perm_addr) { eth_zero_addr(addr); addr[0] = 0x02; - addr[1] = (mac_prefix >> 8) & 0xFF; - addr[2] = mac_prefix & 0xFF; addr[3] = idx >> 8; addr[4] = idx; memcpy(data->addresses[0].addr, addr, ETH_ALEN);