Merge branch 'at91-5.4-trunk/wilc' into linux-5.4-at91

Author: noglitch

drivers/staging/wilc1000/sdio.c

@@ -1126,5 +1126,5 @@ module_driver(wilc_sdio_driver,
 	      sdio_register_driver,
 	      sdio_unregister_driver);
 MODULE_LICENSE("GPL");
-MODULE_VERSION("15.4.1 rc1");
+MODULE_VERSION("15.4.1");
 

drivers/staging/wilc1000/spi.c

@@ -243,7 +243,7 @@ static struct spi_driver wilc_spi_driver = {
 };
 module_spi_driver(wilc_spi_driver);
 MODULE_LICENSE("GPL");
-MODULE_VERSION("15.4.1 rc1");
+MODULE_VERSION("15.4.1");
 
 static int spi_data_rsp(struct wilc *wilc, u8 cmd)
 {

drivers/staging/wilc1000/wlan.c

@@ -1309,11 +1309,11 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size)
 			}
 		} else if (pkt_offset & IS_MANAGMEMENT) {
 			buff_ptr += HOST_HDR_OFFSET;
-			wilc_wfi_mgmt_rx(wilc, buff_ptr, pkt_len);
-		} else if (pkt_offset & IS_MON_PKT) {
-			/* packet received on monitor interface */
-			buff_ptr += HOST_HDR_OFFSET;
-			wilc_wfi_handle_monitor_rx(wilc, buff_ptr, pkt_len);
+
+			if (pkt_offset & IS_MON_PKT)
+				wilc_wfi_handle_monitor_rx(wilc, buff_ptr, pkt_len);
+			else
+				wilc_wfi_mgmt_rx(wilc, buff_ptr, pkt_len);
 		} else {
 			struct net_device *wilc_netdev;
 			struct wilc_vif *vif;