diff --git a/drivers/net/wireless/broadcom/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c
index 6b0e1ec346cb..8291965518ae 100644
--- a/drivers/net/wireless/broadcom/b43/dma.c
+++ b/drivers/net/wireless/broadcom/b43/dma.c
@@ -1484,7 +1484,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 	int slot, firstused;
 	bool frame_succeed;
 	int skip;
-	static u8 err_out1;
+	static u8 err_out1, err_out2;
 
 	ring = parse_cookie(dev, status->cookie, &slot);
 	if (unlikely(!ring))
@@ -1519,12 +1519,16 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 		} else {
 			/* More than a single header/data pair were missed.
 			 * Report this error, and reset the controller to
-			 * revive operation.
+			 * revive operation. Do this only every 40 such errors.
 			 */
-			b43dbg(dev->wl,
-			       "Out of order TX status report on DMA ring %d. Expected %d, but got %d\n",
-			       ring->index, firstused, slot);
-			b43_controller_restart(dev, "Out of order TX");
+			if (!err_out2) {
+				b43dbg(dev->wl,
+				       "Out of order TX status report on DMA ring %d. Expected %d, but got %d\n",
+				       ring->index, firstused, slot);
+			}
+			if (!(err_out2 % 40))
+				b43_controller_restart(dev, "Out of order TX");
+			err_out2 += 1;
 			return;
 		}
 	}
diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index cdf4c9060c51..834896be0022 100644
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -95,6 +95,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 		pr_err("Unable to allocate net_device.\n");
 		return NULL;
 	}
+	strcpy(dev->name, "wlan%d");
 	ieee = (struct rtllib_device *)netdev_priv_rsl(dev);
 	memset(ieee, 0, sizeof(struct rtllib_device)+sizeof_priv);
 	ieee->dev = dev;