package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch

   1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   2 Date: Sun, 31 Jan 2016 12:14:34 +0100
   3 Subject: [PATCH] brcmfmac: treat NULL character in NVRAM as separator
   4 MIME-Version: 1.0
   5 Content-Type: text/plain; charset=UTF-8
   6 Content-Transfer-Encoding: 8bit
   7
   8 Platform NVRAM (stored on a flash partition) has entries separated by a
   9 NULL (\0) char. Our parsing code switches from VALUE state to IDLE
  10 whenever it meets a NULL (\0). When that happens our IDLE handler should
  11 simply consume it and analyze whatever is placed ahead.
  12
  13 This fixes harmless warnings spamming debugging output:
  14 [  155.165624] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=20: ignoring invalid character
  15 [  155.180806] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=44: ignoring invalid character
  16 [  155.195971] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=63: ignoring invalid character
  17
  18 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  19 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  20 ---
  21
  22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  24 @@ -93,7 +93,7 @@ static enum nvram_parser_state brcmf_nvr
  25         c = nvp->data[nvp->pos];
  26         if (c == '\n')
  27                 return COMMENT;
  28 -       if (is_whitespace(c))
  29 +       if (is_whitespace(c) || c == '\0')
  30                 goto proceed;
  31         if (c == '#')
  32                 return COMMENT;