svn commit: r330220 - stable/11/sys/dev/iwm

Eitan Adler eadler at FreeBSD.org
Thu Mar 1 06:50:35 UTC 2018


Author: eadler
Date: Thu Mar  1 06:50:34 2018
New Revision: 330220
URL: https://svnweb.freebsd.org/changeset/base/330220

Log:
  MFC r319582:
  
  [iwm] Ignore IWM_DEBUG_LOG_MSG notifications.
  
  * Firmware versions 21 and 22 generate some IWM_DEBUG_LOG_MSG notifications,
    which seem to be harmless. Avoid spamming the system log with
    "frame ... UNHANDLED (this should not happen)" messages.

Modified:
  stable/11/sys/dev/iwm/if_iwm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c	Thu Mar  1 06:50:05 2018	(r330219)
+++ stable/11/sys/dev/iwm/if_iwm.c	Thu Mar  1 06:50:34 2018	(r330220)
@@ -5338,7 +5338,7 @@ iwm_handle_rxb(struct iwm_softc *sc, struct mbuf *m)
 		    "rx packet qid=%d idx=%d type=%x\n",
 		    qid & ~0x80, pkt->hdr.idx, code);
 
-		len = le32toh(pkt->len_n_flags) & IWM_FH_RSCSR_FRAME_SIZE_MSK;
+		len = iwm_rx_packet_len(pkt);
 		len += sizeof(uint32_t); /* account for status word */
 		nextoff = offset + roundup2(len, IWM_FH_RSCSR_FRAME_ALIGN);
 
@@ -5586,6 +5586,13 @@ iwm_handle_rxb(struct iwm_softc *sc, struct mbuf *m)
 			    notif->status, notif->action);
 			break;
 		}
+
+		/*
+		 * Firmware versions 21 and 22 generate some DEBUG_LOG_MSG
+		 * messages. Just ignore them for now.
+		 */
+		case IWM_DEBUG_LOG_MSG:
+			break;
 
 		case IWM_MCAST_FILTER_CMD:
 			break;


More information about the svn-src-all mailing list