Master failing to compile: patch 379-mac80211-fix-starting-aggregation-sessions-on-mesh-i fails to apply

[Federico Capoano]

Hi Everyone,

I want to compile on the current master to see if some of the issues
that are affecting me on the openwrt-21.02 branch are fixed (if these
bugs aren't fixed I may be able to send a proper bug report after
ruling out they're not fixed in master).

However, the compilation fails here:

Applying ./patches/subsys/379-mac80211-fix-starting-aggregation-sessions-on-mesh-i.patch.orig
using plaintext:
patching file net/mac80211/tx.c
Hunk #1 succeeded at 1182 with fuzz 1 (offset 23 lines).
Hunk #2 FAILED at 1195.
1 out of 2 hunks FAILED -- saving rejects to file net/mac80211/tx.c.rej
Patch failed!  Please fix
./patches/subsys/379-mac80211-fix-starting-aggregation-sessions-on-mesh-i.patch.orig!
make[3]: *** [Makefile:571:
/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/backports-5.10.68-1/.prepared_ad0d13a25d90a8619224f58a2c623adf_6664517399ebbbc92a37c5bb081b5c53]
Error 1
make[3]: Leaving directory '/openwrt/package/kernel/mac80211'
time: package/kernel/mac80211/compile#1.00#0.36#1.12
    ERROR: package/kernel/mac80211 failed to build.
make[2]: *** [package/Makefile:116: package/kernel/mac80211/compile] Error 1

I was compiling fine on the openwrt-21.02 branch. I ran "make clean"
before compiling again and changed the feeds to point to the current
master branches of each package feed useded.

Am I missing something or is it happening also to others?

Thanks in advance
Best regards
Federico Capoano