A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge e3e8d39bc9 on remote branch

Browse source 
Change-Id: I36076e3a9a2e61a557e8469377048f1fe6fc6887
This commit is contained in:
Linux Build Service Account 2024-05-13 08:20:01 -07:00
commit 63ebfb604e
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/hdd/src/wlan_hdd_scan.c
View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022,2024 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -1226,9 +1226,8 @@ static int __wlan_hdd_vendor_abort_scan(
if (0 != ret)
return ret;
wlan_vendor_abort_scan(hdd_ctx->pdev, data, data_len);
return wlan_vendor_abort_scan(hdd_ctx->pdev, data, data_len);
return ret;
}
/**
@ -1249,6 +1248,8 @@ int wlan_hdd_vendor_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev,
struct osif_vdev_sync *vdev_sync;
int errno;
hdd_enter_dev(wdev->netdev);
errno = osif_vdev_sync_op_start(wdev->netdev, &vdev_sync);
if (errno)
return errno;

4
core/mac/inc/qwlan_version.h
View file

@ -32,9 +32,9 @@
#define QWLAN_VERSION_MAJOR 2
#define QWLAN_VERSION_MINOR 0
#define QWLAN_VERSION_PATCH 8
#define QWLAN_VERSION_EXTRA "N"
#define QWLAN_VERSION_EXTRA "O"
#define QWLAN_VERSION_BUILD 34
#define QWLAN_VERSIONSTR "2.0.8.34N"
#define QWLAN_VERSIONSTR "2.0.8.34O"
#endif /* QWLAN_VERSION_H */