From nobody Mon Feb 14 23:51:13 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6AEF6194A058; Mon, 14 Feb 2022 23:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JyLb52WDMz3Pyh; Mon, 14 Feb 2022 23:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644882673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gdzIPji+JeO1kEbc4tHdoSb8XFv2nf6yaGgIzN35efQ=; b=iIu0U2295UTy3uPbwBnhmh0eLprvLM/YdAm4qv1+gFMRlTAtkPr1WBHzolsE7GXfCrKSy+ VLt1rRToYsE65U5OxWlfG1ryGF9t1tOlrM7XuuGM1x4Qo/GXXKfGDJ/KcSkyJaSGkvP5+N fBn3s5+JrWcbcIevZCjnUqASLgart89awQlNaeOshnUmYUYnhIarCluUEDUSTzaRgsKWRf C52k1JXAobXNwoeHGjD1fPy9fNx+LkL5LsK4O0BTZ5V3sZXIt0ZdSU87YnMXLobMYxjEGU QXDyYKdvZ+cIGIfIFREHTfosJ3qqGFKKHjJZbo3F1geQniFFyFz0Fm3C4E7ewA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3659218283; Mon, 14 Feb 2022 23:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21ENpD8F067846; Mon, 14 Feb 2022 23:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ENpDj9067845; Mon, 14 Feb 2022 23:51:13 GMT (envelope-from git) Date: Mon, 14 Feb 2022 23:51:13 GMT Message-Id: <202202142351.21ENpDj9067845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cee56e77d779 - main - LinuxKPI: 802.11: get rid of lkpi_ic_getradiocaps warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cee56e77d77909df69624cc707a571647651c853 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644882673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gdzIPji+JeO1kEbc4tHdoSb8XFv2nf6yaGgIzN35efQ=; b=ZrOmCzHJP+lXIn0W3e3bmoZlgAjjJ7HQoekSvQhwAsM75ivV5lSwg6XW0Uul8bTV9U5pHG pNCo1lOckozSt+6bmLtIUwia8UpIh45EWycosJfaaYXPtVZGeWG3JdXGCWnnrYDnUiNuHf Fb8UgmZd7TRnI47WTUGtS9eSAZHE+JXhYUh9dWfBgkZZzHzOT+3SGbahYHIO6jX/ndLbNY 4hgooy74+kJLq+HHBb1Ppa8ZdccEER+Ij9zWt2B901e83qZYdMu1H72TapD+kvEPogTm0P dJ3z79yvMxBMwSP+uctPhfp6Fum8A9weG++6j3QGfWk6PZraK4Wfaf04sRRlCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644882673; a=rsa-sha256; cv=none; b=olJkGoAedsIxVrbnrx/hROTQ6W/hOC97mcJrL1ZZ3pzJ5wKN9e2gE6TTlty6VDh/kHZ4Ko xut5sL8RNy3vZ2F7trcQILo7kBU3cTlZlM3MTTQwXEnqNyC9Jm4KuCgY3wTPy32nzg56Yd /2G01fTodC904Qu9gJLr/jUOjP/zWWFNM+7/8lu9KnzniczdudOeFT0VF2zbs+X71PHE9D Ea61idiM8SRZT+M0flfrl2xlR+z7PWmVmetAsYhE/Qrk62bZRfxaVUzGZnj3TPymElRIEh s+JxsAxlryqHmIBX81bqCinw2jxgdRuDJKjeg/M3sxx2Bwk/Qrdc3lNMqFPAoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cee56e77d77909df69624cc707a571647651c853 commit cee56e77d77909df69624cc707a571647651c853 Author: Bjoern A. Zeeb AuthorDate: 2022-02-14 22:29:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-14 23:48:31 +0000 LinuxKPI: 802.11: get rid of lkpi_ic_getradiocaps warnings Users are seeing warnings about 2 channels (1 per band) triggered by an ioctl from wpa_supplicant usually: lkpi_ic_getradiocaps: Adding chan ... returned error 55 This was an early FAQ. Check the current number of channels against maxchans and the return code from net80211. In case net80211 reports that we reached the limit do not print the warning and do not try to add further channels. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index beb2b03f0498..c69df86c3fa2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2579,7 +2579,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, #endif channels = hw->wiphy->bands[NL80211_BAND_2GHZ]->channels; - for (i = 0; i < nchans; i++) { + for (i = 0; i < nchans && *n < maxchan; i++) { uint32_t nflags = 0; int cflags = chan_flags; @@ -2606,14 +2606,15 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, nflags, bands, chan_flags); - if (error != 0) { + /* net80211::ENOBUFS: *n >= maxchans */ + if (error != 0 && error != ENOBUFS) printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x " "returned error %d\n", ic->ic_name, __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags, nflags, chan_flags, cflags, error); + if (error != 0) break; - } } } @@ -2648,7 +2649,7 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, #endif channels = hw->wiphy->bands[NL80211_BAND_5GHZ]->channels; - for (i = 0; i < nchans; i++) { + for (i = 0; i < nchans && *n < maxchan; i++) { uint32_t nflags = 0; int cflags = chan_flags; @@ -2675,14 +2676,15 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan, channels[i].hw_value, channels[i].center_freq, channels[i].max_power, nflags, bands, chan_flags); - if (error != 0) { + /* net80211::ENOBUFS: *n >= maxchans */ + if (error != 0 && error != ENOBUFS) printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x " "returned error %d\n", ic->ic_name, __func__, channels[i].hw_value, channels[i].center_freq, channels[i].flags, nflags, chan_flags, cflags, error); + if (error != 0) break; - } } } }