---

yaml
---
r: 351817
b: refs/heads/master
c: 03abad0
h: refs/heads/master
i:
  351815: dc382f4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b84e3112ecc73482a7e07cd88bf2feaa60e42634
+refs/heads/master: 03abad08bb837650feb2bd7581ef14c8a1c51964

trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h

@@ -496,9 +496,6 @@ struct brcmf_pub {
 	/* Last error return */
 	int bcmerror;
 
-	/* Last error from dongle */
-	int dongle_error;
-
 	/* Suspend disable flag  flag */
 	int suspend_disable_flag;	/* "1" to disable all extra powersaving
 					 during suspend */

trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

@@ -147,18 +147,6 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
 
 	brcmf_dbg(CDC, "Enter, cmd %d len %d\n", cmd, len);
 
-	/* Respond "bcmerror" and "bcmerrorstr" with local cache */
-	if (cmd == BRCMF_C_GET_VAR && buf) {
-		if (!strcmp((char *)buf, "bcmerrorstr")) {
-			strncpy((char *)buf, "bcm_error",
-				BCME_STRLEN);
-			goto done;
-		} else if (!strcmp((char *)buf, "bcmerror")) {
-			*(int *)buf = drvr->dongle_error;
-			goto done;
-		}
-	}
-
 	memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd));
 
 	msg->cmd = cpu_to_le32(cmd);
@@ -207,11 +195,8 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
 	}
 
 	/* Check the ERROR flag */
-	if (flags & CDC_DCMD_ERROR) {
+	if (flags & CDC_DCMD_ERROR)
 		ret = le32_to_cpu(msg->status);
-		/* Cache error from dongle */
-		drvr->dongle_error = ret;
-	}
 
 done:
 	return ret;
@@ -258,11 +243,8 @@ int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
 	}
 
 	/* Check the ERROR flag */
-	if (flags & CDC_DCMD_ERROR) {
+	if (flags & CDC_DCMD_ERROR)
 		ret = le32_to_cpu(msg->status);
-		/* Cache error from dongle */
-		drvr->dongle_error = ret;
-	}
 
 done:
 	return ret;