On Wed, Aug 11, 2021 at 09:09:49PM -0500, Larry Finger wrote: > On 8/11/21 7:25 PM, Fabio M. De Francesco wrote: > > Remove all 5Ghz network types. r8188eu works on > > 802.11bgn standards and on 2.4Ghz band. > > > > Signed-off-by: Fabio M. De Francesco<fmdefrancesco@xxxxxxxxx> > > --- > > drivers/staging/r8188eu/core/rtw_ap.c | 13 ++--------- > > drivers/staging/r8188eu/core/rtw_ieee80211.c | 19 +++------------ > > drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- > > drivers/staging/r8188eu/core/rtw_mlme.c | 10 -------- > > drivers/staging/r8188eu/core/rtw_p2p.c | 2 +- > > drivers/staging/r8188eu/core/rtw_wlan_util.c | 15 ++---------- > > drivers/staging/r8188eu/hal/odm.c | 1 - > > drivers/staging/r8188eu/include/ieee80211.h | 23 ++----------------- > > drivers/staging/r8188eu/include/wifi.h | 2 +- > > drivers/staging/r8188eu/include/wlan_bssdef.h | 2 +- > > 10 files changed, 13 insertions(+), 76 deletions(-) > > Fabio, > > This patch is fine, but it does conflict with my series fixing the smatch > warnings. Whichever set Greg takes first will apply cleanly, but the second > will fail. This problem is due to many people working at the same time. > > Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx> I worked it out and took both series, git is good at handling merge issues like this :) thanks, greg k-h
