Merge branches 'no_mt7697_in_sdef' and 'commit_accident'

linux_kernel_modules/mt7697wifi/scripts/test/wifi_service_ap_test.sh

+#!/bin/sh
+# Copyright (C) Sierra Wireless Inc.
+#
+
+export ITF_LAN="wlan1" # WiFi? access point interface
+
+echo "Start wifi web application..." 
+app start wifiWebAp $ITF_LAN
+

linux_kernel_modules/mt7697wifi/scripts/test/wifi_service_sta_test.sh

+#!/bin/sh
+# Copyright (C) Sierra Wireless Inc.
+#
+
+export ITF_LAN="wlan1" # WiFi? access point interface
+export CLIENT_REF="0x10000001"
+export PASSPHRASE="@iPr1m3"
+export SECURITY_PROTO="3"
+
+echo "Start wifi client..." 
+wifi client start $ITF_LAN
+
+echo "Begin wifi client scan..."
+wifi client scan $ITF_LAN
+
+echo "Set security parameters..."
+wifi client setsecurityproto $CLIENT_REF $SECURITY_PROTO
+wifi client setpassphrase $CLIENT_REF $PASSPHRASE
+
+echo "Set WPA driver..."
+wifi client setdriver $CLIENT_REF 1
+
+echo "Connect to access point..."
+wifi client connect $CLIENT_REF

linux_kernel_modules/mt7697wifi/txrx.c

@@ -69,7 +69,7 @@ int mt7697_data_tx(struct sk_buff *skb, struct net_device *ndev)
 	if (tx_skb->skb) {
 		dev_warn(cfg->dev, "%s(): tx pool full\n", 
 			__func__);
-		ret = -EAGAIN;
+		ret = NETDEV_TX_BUSY;
 		goto cleanup;
  	}
 
@@ -89,6 +89,7 @@ int mt7697_data_tx(struct sk_buff *skb, struct net_device *ndev)
 	if (ret < 0) {
 		dev_err(cfg->dev, "%s(): queue_work() failed(%d)\n", 
 			__func__, ret);
+		ret = NETDEV_TX_BUSY;
 		goto cleanup;
 	}