From: Seungpyo Hong <sp.hong@samsung.com>
Date: Fri, 13 Dec 2019 07:12:48 +0000 (+0900)
Subject: Merge remote-tracking branch 'ohd/q-keystone-samsung-slsi-worldwide-incoming' into... 
X-Git-Tag: MMI-RSA31.Q1-48-36-11~6^2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b562f8586de4a63eee7d61e681a7a39196f5912;p=GitHub%2FMotorolaMobilityLLC%2Fhardware-samsung_slsi-scsc_wifibt-wifi_hal.git

Merge remote-tracking branch 'ohd/q-keystone-samsung-slsi-worldwide-incoming' into q-keystone-samsung-slsi-ww-internal-dev

Change-Id: Ib8d2cbf5a46404a0a1a00b32d877a8fe68e3acab
---

6b562f8586de4a63eee7d61e681a7a39196f5912
diff --cc nan_common.h
index 7a75a6b,44d7f77..63c8a10
--- a/nan_common.h
+++ b/nan_common.h
@@@ -306,8 -304,7 +306,8 @@@ typedef enum 
      NAN_EVT_ATTR_APP_INFO,
      NAN_EVT_ATTR_CHANNEL,
      NAN_EVT_ATTR_CHANNEL_BW,
 -    NAN_EVT_ATTR_CHANNEL_NSS
 +    NAN_EVT_ATTR_CHANNEL_NSS,
 +    NAN_EVT_ATTR_HAL_TRANSACTION_ID
  } NAN_EVT_ATTRIBUTES;
  
--#endif
++#endif