From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Kalle Valo <kvalo@kernel.org>,
Johannes Berg <johannes@sipsolutions.net>,
Wireless <linux-wireless@vger.kernel.org>,
Felix Fietkau <nbd@nbd.name>,
Johannes Berg <johannes.berg@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Networking <netdev@vger.kernel.org>,
Jakub Kicinski <kuba@kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the wireless tree
Date: Mon, 3 Apr 2023 12:23:13 +1000 [thread overview]
Message-ID: <20230403122313.6006576b@canb.auug.org.au> (raw)
In-Reply-To: <20230331104959.0b30604d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 3068 bytes --]
Hi all,
On Fri, 31 Mar 2023 10:49:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the wireless-next tree got a conflict in:
>
> net/mac80211/rx.c
>
> between commit:
>
> a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference")
>
> from the wireless tree and commit:
>
> fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format")
>
> from the wireless-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc net/mac80211/rx.c
> index 3e2176a730e6,1c957194554b..000000000000
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@@ -2776,27 -2862,12 +2843,31 @@@ ieee80211_rx_mesh_data(struct ieee80211
> rcu_read_unlock();
> }
>
> + /* Frame has reached destination. Don't forward */
> + if (ether_addr_equal(sdata->vif.addr, eth->h_dest))
> + goto rx_accept;
> +
> + if (!--mesh_hdr->ttl) {
> + if (multicast)
> + goto rx_accept;
> +
> + IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl);
> + return RX_DROP_MONITOR;
> + }
> +
> + if (!ifmsh->mshcfg.dot11MeshForwarding) {
> + if (is_multicast_ether_addr(eth->h_dest))
> + goto rx_accept;
> +
> + return RX_DROP_MONITOR;
> + }
> +
> skb_set_queue_mapping(skb, ieee802_1d_to_ac[skb->priority]);
>
> + if (!multicast &&
> + ieee80211_rx_mesh_fast_forward(sdata, skb, mesh_hdrlen))
> + return RX_QUEUED;
> +
> ieee80211_fill_mesh_addresses(&hdr, &hdr.frame_control,
> eth->h_dest, eth->h_source);
> hdrlen = ieee80211_hdrlen(hdr.frame_control);
> @@@ -2914,14 -2982,24 +2985,24 @@@ __ieee80211_rx_h_amsdu(struct ieee80211
> data_offset, true))
> return RX_DROP_UNUSABLE;
>
> - if (rx->sta && rx->sta->amsdu_mesh_control < 0) {
> + if (rx->sta->amsdu_mesh_control < 0) {
> - bool valid_std = ieee80211_is_valid_amsdu(skb, true);
> - bool valid_nonstd = ieee80211_is_valid_amsdu(skb, false);
> + s8 valid = -1;
> + int i;
> +
> + for (i = 0; i <= 2; i++) {
> + if (!ieee80211_is_valid_amsdu(skb, i))
> + continue;
> +
> + if (valid >= 0) {
> + /* ambiguous */
> + valid = -1;
> + break;
> + }
>
> - if (valid_std && !valid_nonstd)
> - rx->sta->amsdu_mesh_control = 1;
> - else if (valid_nonstd && !valid_std)
> - rx->sta->amsdu_mesh_control = 0;
> + valid = i;
> + }
> +
> + rx->sta->amsdu_mesh_control = valid;
> }
>
> ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
This is now a conflict between the net-next and net trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-04-03 2:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 23:49 linux-next: manual merge of the wireless-next tree with the wireless tree Stephen Rothwell
2023-03-31 9:17 ` Johannes Berg
2023-04-03 2:23 ` Stephen Rothwell [this message]
2023-04-03 8:43 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2023-09-12 2:46 Stephen Rothwell
2023-09-26 2:02 Stephen Rothwell
2023-09-26 2:41 ` Stephen Rothwell
2023-09-26 6:21 ` Johannes Berg
2023-09-26 2:20 Stephen Rothwell
2024-02-08 23:56 Stephen Rothwell
2024-02-09 7:03 ` Johannes Berg
2024-03-25 23:09 Stephen Rothwell
2024-03-26 7:58 ` Johannes Berg
2024-04-22 0:56 Stephen Rothwell
2024-05-31 2:44 Stephen Rothwell
2024-06-03 1:01 Stephen Rothwell
2024-06-03 10:01 ` Kalle Valo
2024-06-06 10:09 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230403122313.6006576b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=ryder.lee@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).