| Message ID | 20170907235103.5359-1-kilobyte@angband.pl |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | rtl8xxxu: Don't printk raw binary if serial number is not burned in. | expand |
On Fri, 8 Sep 2017 01:51:03 +0200 Adam Borowski <kilobyte@angband.pl> wrote: > I assume that a blank efuse comes with all ones, thus I did not bother > recognizing other possible junk values. This matches 100% of dongles > I've seen (a single Gembird 8192eu). > > Signed-off-by: Adam Borowski <kilobyte@angband.pl> > --- > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c > index 80fee699f58a..bdc37e7272ca 100644 > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c > @@ -614,7 +614,11 @@ static int rtl8192eu_parse_efuse(struct rtl8xxxu_priv *priv) > > dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name); > dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name); > - dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial); > + if (strncmp(efuse->serial, > + "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff", 11)) You might want to use memchr_inv(): if (memchr_inv(efuse->serial, 0xff, 11)) dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial); ... Mostly cosmetic though. -- Stefano
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c index 80fee699f58a..bdc37e7272ca 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c @@ -614,7 +614,11 @@ static int rtl8192eu_parse_efuse(struct rtl8xxxu_priv *priv) dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name); dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name); - dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial); + if (strncmp(efuse->serial, + "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff", 11)) + dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial); + else + dev_info(&priv->udev->dev, "Serial not available.\n"); if (rtl8xxxu_debug & RTL8XXXU_DEBUG_EFUSE) { unsigned char *raw = priv->efuse_wifi.raw;
I assume that a blank efuse comes with all ones, thus I did not bother recognizing other possible junk values. This matches 100% of dongles I've seen (a single Gembird 8192eu). Signed-off-by: Adam Borowski <kilobyte@angband.pl> --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)