projects / GitHub / MotorolaMobilityLLC / hardware-samsung_slsi-scsc_wifibt-wifi_hal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5aa94c e69c030)
Merge remote-tracking branch 'ohd/q-keystone-samsung-slsi-worldwide-incoming' into...
authorSeungpyo Hong <sp.hong@samsung.com>
Fri, 13 Dec 2019 07:12:48 +0000 (16:12 +0900)
committerSeungpyo Hong <sp.hong@samsung.com>
Fri, 13 Dec 2019 07:12:48 +0000 (16:12 +0900)
Change-Id: Ib8d2cbf5a46404a0a1a00b32d877a8fe68e3acab

1  2 
nan_common.h patch | diff1 | diff2 | blob | history

diff --cc nan_common.h
index 7a75a6bdc3df61e6d7155690d39d6fb709e1d148,44d7f77bf6917676d4eb40d59971adde31e01aab..63c8a108fbfb46973a53b4cc199f05ae7885bc61
--- 1/nan_common.h
--- 2/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