Revert "wifi: iwlegacy: do not skip frames with bad FCS"

Kalle Valo · Kalle Valo · commit 11597043d748 · 2024-11-12T20:24:45.000+02:00
This reverts commit 02b682d. Alf reports that this commit causes the connection to eventually die on iwl4965. The reason is that rx_status.flag is zeroed after RX_FLAG_FAILED_FCS_CRC is set and mac80211 doesn't know the received frame is corrupted. Fixes: 02b682d ("wifi: iwlegacy: do not skip frames with bad FCS") Reported-by: Alf Marius <post@alfmarius.net> Closes: https://lore.kernel.org/r/60f752e8-787e-44a8-92ae-48bdfc9b43e7@app.fastmail.com/ Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://patch.msgid.link/20241112142419.1023743-1-kvalo@kernel.org
diff --git a/drivers/net/wireless/intel/iwlegacy/3945.c b/drivers/net/wireless/intel/iwlegacy/3945.c
@@ -566,7 +566,7 @@ il3945_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
 	if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR) ||
 	    !(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
 		D_RX("Bad CRC or FIFO: 0x%08X.\n", rx_end->status);
-		rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
+		return;
 	}
 
 	/* Convert 3945's rssi indicator to dBm */
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -664,7 +664,7 @@ il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb)
 	if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) ||
 	    !(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
 		D_RX("Bad CRC or FIFO: 0x%08X.\n", le32_to_cpu(rx_pkt_status));
-		rx_status.flag |= RX_FLAG_FAILED_FCS_CRC;
+		return;
 	}
 
 	/* This will be used in several places later */

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ il3945_hdl_rx(struct il_priv il, struct il_rx_buf rxb)`
`566`	`566`	`if (!(rx_end->status & RX_RES_STATUS_NO_CRC32_ERROR) \|\|`
`567`	`567`	`!(rx_end->status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {`
`568`	`568`	`D_RX("Bad CRC or FIFO: 0x%08X.\n", rx_end->status);`
`569`		`- rx_status.flag \|= RX_FLAG_FAILED_FCS_CRC;`
	`569`	`+ return;`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`/* Convert 3945's rssi indicator to dBm */`
Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ il4965_hdl_rx(struct il_priv il, struct il_rx_buf rxb)`
`664`	`664`	`if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) \|\|`
`665`	`665`	`!(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {`
`666`	`666`	`D_RX("Bad CRC or FIFO: 0x%08X.\n", le32_to_cpu(rx_pkt_status));`
`667`		`- rx_status.flag \|= RX_FLAG_FAILED_FCS_CRC;`
	`667`	`+ return;`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`/* This will be used in several places later */`