Merge branch 'feature/set_mac_address' into 'master'

esp_hosted_ng: Add support for ndo_set_mac_address

See merge request app-frameworks/esp_hosted!291

Author: mantriyogesh

esp_hosted_ng/host/esp_cfg80211.c

@@ -491,11 +491,11 @@ static void esp_cfg80211_set_wakeup(struct wiphy *wiphy,
 	/*esp_dbg("\n");*/
 }
 
-//TODO get MAX_TAX_POWER from Firmware for future chips
-#define MAX_TAX_POWER (20 * 100)
+/* TODO get MAX_TX_POWER_MBM from Firmware for future chips */
+#define MAX_TX_POWER_MBM (20 * 100)
 static bool is_txpwr_valid(int mbm)
 {
-	if (mbm > MAX_TAX_POWER)
+	if (mbm > MAX_TX_POWER_MBM)
 		return false;
 
 	return true;
@@ -534,7 +534,7 @@ static int esp_cfg80211_set_tx_power(struct wiphy *wiphy,
         switch (type) {
         case NL80211_TX_POWER_AUTOMATIC:
                 priv->tx_pwr_type = NL80211_TX_POWER_AUTOMATIC;
-                priv->tx_pwr = mbm_to_esp_pwr(MAX_TAX_POWER);
+                priv->tx_pwr = mbm_to_esp_pwr(MAX_TX_POWER_MBM);
                 break;
         case NL80211_TX_POWER_LIMITED:
                 if (!is_txpwr_valid(mbm)) {

esp_hosted_ng/host/esp_cmd.c

@@ -239,6 +239,7 @@ static int wait_and_decode_cmd_resp(struct esp_wifi_device *priv,
 		break;
 
 	case CMD_GET_MAC:
+	case CMD_SET_MAC:
 		if (ret == 0)
 			ret = decode_mac_addr(priv, cmd_node);
 		break;
@@ -1382,6 +1383,37 @@ int cmd_get_mac(struct esp_wifi_device *priv)
 	return 0;
 }
 
+int cmd_set_mac(struct esp_wifi_device *priv, uint8_t *mac_addr)
+{
+	u16 cmd_len;
+	struct command_node *cmd_node = NULL;
+	struct cmd_config_mac_address *cmd;;
+
+	if (!priv || !priv->adapter) {
+		esp_err("Invalid argument\n");
+		return -EINVAL;
+	}
+
+	cmd_len = sizeof(struct cmd_config_mac_address);
+
+	cmd_node = prepare_command_request(priv->adapter, CMD_SET_MAC, cmd_len);
+
+	if (!cmd_node) {
+		esp_err("Failed to get command node\n");
+		return -ENOMEM;
+	}
+
+	cmd = (struct cmd_config_mac_address *) (cmd_node->cmd_skb->data +
+				sizeof(struct esp_payload_header));
+
+	memcpy(cmd->mac_addr, mac_addr, MAC_ADDR_LEN);
+	queue_cmd_node(priv->adapter, cmd_node, ESP_CMD_DFLT_PRIO);
+	queue_work(priv->adapter->cmd_wq, &priv->adapter->cmd_work);
+
+	RET_ON_FAIL(wait_and_decode_cmd_resp(priv, cmd_node));
+
+	return 0;
+}
 
 int esp_commands_teardown(struct esp_adapter *adapter)
 {

esp_hosted_ng/host/include/esp_cmd.h

@@ -31,6 +31,7 @@ int process_cmd_resp(struct esp_adapter *adapter, struct sk_buff *skb);
 int cmd_scan_request(struct esp_wifi_device *priv,
 		struct cfg80211_scan_request *request);
 int cmd_get_mac(struct esp_wifi_device *priv);
+int cmd_set_mac(struct esp_wifi_device *priv, uint8_t *mac_addr);
 int process_cmd_event(struct esp_wifi_device *priv, struct sk_buff *skb);
 int cmd_connect_request(struct esp_wifi_device *priv,
 		struct cfg80211_connect_params *params);

esp_hosted_ng/host/include/esp_kernel_port.h

@@ -160,14 +160,6 @@ static inline void *skb_put_data(struct sk_buff *skb, const void *data,
 }
 #endif
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0))
-    #define NDO_TX_TIMEOUT_PROTOTYPE() \
-	void esp_tx_timeout(struct net_device *ndev)
-#else
-    #define NDO_TX_TIMEOUT_PROTOTYPE() \
-	void esp_tx_timeout(struct net_device *ndev, unsigned int txqueue)
-#endif
-
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
 #define do_exit(code)	kthread_complete_and_exit(NULL, code)
 #endif

esp_hosted_ng/host/main.c

@@ -287,24 +287,23 @@ static struct net_device_stats *esp_get_stats(struct net_device *ndev)
 	return &priv->stats;
 }
 
-#if 0
 static int esp_set_mac_address(struct net_device *ndev, void *data)
 {
 	struct esp_wifi_device *priv = netdev_priv(ndev);
-	//struct sockaddr *mac_addr = data;
+	struct sockaddr *sa = (struct sockaddr *)data;
+	int ret;
 
 	if (!priv || !priv->adapter)
 		return -EINVAL;
 
-	esp_info("%u "MACSTR"\n", __LINE__, MAC2STR(priv->mac_address));
-	eth_hw_addr_set(ndev, priv->mac_address/*mac_addr->sa_data*/);
+	esp_info("%u "MACSTR"\n", __LINE__, MAC2STR(sa->sa_data));
 
-	return 0;
-}
-#endif
+	ret = cmd_set_mac(priv, sa->sa_data);
 
-static NDO_TX_TIMEOUT_PROTOTYPE()
-{
+	if (ret == 0)
+		eth_hw_addr_set(ndev, priv->mac_address/*mac_addr->sa_data*/);
+
+	return ret;
 }
 
 static void esp_set_rx_mode(struct net_device *ndev)
@@ -379,8 +378,8 @@ static const struct net_device_ops esp_netdev_ops = {
 	.ndo_open = esp_open,
 	.ndo_stop = esp_stop,
 	.ndo_start_xmit = esp_hard_start_xmit,
+	.ndo_set_mac_address = esp_set_mac_address,
 	.ndo_validate_addr = eth_validate_addr,
-	.ndo_tx_timeout = esp_tx_timeout,
 	.ndo_get_stats = esp_get_stats,
 	.ndo_set_rx_mode = esp_set_rx_mode,
 };