From: Tarun Karela <t.karela@samsung.com>
Date: Wed, 30 May 2018 13:54:15 +0000 (+0100)
Subject: [9610] wlbt: Fix/mask out compilation erros in cfg80211_ops.c (Android P)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1601676e8fce5d5fc60ec41cbc727c7be0503e97;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9610] wlbt: Fix/mask out compilation erros in cfg80211_ops.c (Android P)

drivers/net/wireless/scsc/cfg80211_ops.c: In function 'slsi_add_virtual_intf':
drivers/net/wireless/scsc/cfg80211_ops.c:62:10: error: 'flags' undeclared (first use in this function)
  SLSI_UNUSED_PARAMETER(flags);
          ^
drivers/net/wireless/scsc/cfg80211_ops.c:62:10: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/wireless/scsc/cfg80211_ops.c: At top level:
drivers/net/wireless/scsc/cfg80211_ops.c:2784:2: warning: initialization from incompatible pointer type
  .change_virtual_intf = slsi_change_virtual_intf,
  ^
drivers/net/wireless/scsc/cfg80211_ops.c:2784:2: warning: (near initialization for 'slsi_ops.change_virtual_intf')
drivers/net/wireless/scsc/cfg80211_ops.c:2824:2: warning: initialization from incompatible pointer type
  .sched_scan_stop = slsi_sched_scan_stop,
  ^
drivers/net/wireless/scsc/cfg80211_ops.c:2824:2: warning: (near initialization for 'slsi_ops.sched_scan_stop')
drivers/net/wireless/scsc/cfg80211_ops.c: In function 'slsi_cfg80211_new':
drivers/net/wireless/scsc/cfg80211_ops.c:3186:18: error: 'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
  wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
                  ^
scripts/Makefile.build:328: recipe for target 'drivers/net/wireless/scsc/cfg80211_ops.o' failed
make[4]: *** [drivers/net/wireless/scsc/cfg80211_ops.o] Error 1
make[4]: *** Waiting for unfinished jobs....

Change-Id: Ice77ca9fde1d7f6fae5c8b2081f7c0c6c55ca287
SCSC-Bug-Id: SSB-40175
Signed-off-by: Tarun Karela <t.karela@samsung.com>
---

diff --git a/drivers/net/wireless/scsc/cfg80211_ops.c b/drivers/net/wireless/scsc/cfg80211_ops.c
index 405262169f6b..ef58ed83086a 100755
--- a/drivers/net/wireless/scsc/cfg80211_ops.c
+++ b/drivers/net/wireless/scsc/cfg80211_ops.c
@@ -24,6 +24,14 @@ static uint keep_alive_period = SLSI_P2PGO_KEEP_ALIVE_PERIOD_SEC;
 module_param(keep_alive_period, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(keep_alive_period, "default is 10 seconds");
 
+
+struct wireless_dev *slsi_add_virtual_intf(struct wiphy        *wiphy,
+					   const char          *name,
+					   unsigned char       name_assign_type,
+					   enum nl80211_iftype type,
+					   struct vif_params   *params)
+{
+#if 0
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 9))
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
 struct wireless_dev *slsi_add_virtual_intf(struct wiphy        *wiphy,
@@ -49,10 +57,11 @@ struct net_device *slsi_add_ virtual_intf(struct wiphy        *wiphy,
 					 struct vif_params   *params)
 {
 #endif  /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 9)) */
+#endif
 	struct net_device *dev = NULL;
 	struct netdev_vif *ndev_vif = NULL;
 
-	SLSI_UNUSED_PARAMETER(flags);
+     /*	SLSI_UNUSED_PARAMETER(flags); */
 	SLSI_NET_DBG1(dev, SLSI_CFG80211, "Intf name:%d, type:%d, macaddr:%pM\n", name, type, params->macaddr);
 	dev = slsi_new_interface_create(wiphy, name, type, params);
 	if (!dev)
@@ -93,13 +102,14 @@ int slsi_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
 
 int slsi_change_virtual_intf(struct wiphy *wiphy,
 			     struct net_device *dev,
-			     enum nl80211_iftype type, u32 *flags,
+			     enum nl80211_iftype type, 
+			     /* u32 *flags, */
 			     struct vif_params *params)
 {
 	struct netdev_vif *ndev_vif = netdev_priv(dev);
 	int               r = 0;
 
-	SLSI_UNUSED_PARAMETER(flags);
+	/* SLSI_UNUSED_PARAMETER(flags); */
 
 	SLSI_MUTEX_LOCK(ndev_vif->vif_mutex);
 
@@ -651,12 +661,13 @@ exit:
 	return r;
 }
 
-int slsi_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev)
+int slsi_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev, u64 reqid)
 {
 	struct netdev_vif *ndev_vif = netdev_priv(dev);
 	struct slsi_dev   *sdev = SDEV_FROM_WIPHY(wiphy);
 	int               r = 0;
 
+	SLSI_UNUSED_PARAMETER(reqid);
 	SLSI_MUTEX_LOCK(ndev_vif->scan_mutex);
 	SLSI_NET_DBG1(dev, SLSI_CFG80211, "vif_index:%d", ndev_vif->ifnum);
 	if (!ndev_vif->scan[SLSI_SCAN_SCHED_ID].sched_req) {
@@ -3176,7 +3187,7 @@ struct slsi_dev                           *slsi_cfg80211_new(struct device *dev)
 	wiphy->max_scan_ie_len = 2048;
 
 	/* Scheduled scanning support */
-	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+	/* wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; */
 	/* Match the maximum number of SSIDs that could be requested from wpa_supplicant */
 	wiphy->max_sched_scan_ssids = 16;