diff --git a/common.h b/common.h
index ff3f32e..164db79 100755
--- a/common.h
+++ b/common.h
@@ -156,7 +156,9 @@
     SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO,
     SLSI_NL80211_VENDOR_SUBCMD_LLS_CLEAR_INFO,
     SLSI_NL80211_VENDOR_SUBCMD_GET_FEATURE_SET,
-    SLSI_NL80211_VENDOR_SUBCMD_SET_COUNTRY_CODE
+    SLSI_NL80211_VENDOR_SUBCMD_SET_COUNTRY_CODE,
+    SLSI_NL80211_VENDOR_SUBCMD_CONFIGURE_ND_OFFLOAD
+
 } WIFI_SUB_COMMAND;
 
 typedef enum {
diff --git a/wifi_hal.cpp b/wifi_hal.cpp
index 04474d2..2c9b2ec 100755
--- a/wifi_hal.cpp
+++ b/wifi_hal.cpp
@@ -49,8 +49,7 @@
 static wifi_error wifi_init_interfaces(wifi_handle handle);
 
 typedef enum wifi_attr {
-    ANDR_WIFI_ATTRIBUTE_NUM_FEATURE_SET,
-    ANDR_WIFI_ATTRIBUTE_FEATURE_SET,
+    ANDR_WIFI_ATTRIBUTE_ND_OFFLOAD_CONFIG,
     ANDR_WIFI_ATTRIBUTE_PNO_RANDOM_MAC_OUI
 } wifi_attr_t;
 
@@ -131,6 +130,7 @@
     fn->wifi_clear_link_stats = wifi_clear_link_stats;
     fn->wifi_set_country_code = wifi_set_country_code;
     fn->wifi_configure_roaming = wifi_configure_roaming;
+    fn->wifi_configure_nd_offload = wifi_configure_nd_offload;
 
     return WIFI_SUCCESS;
 }
@@ -786,6 +786,35 @@
 
 };
 
+class SetNdoffloadCommand : public WifiCommand {
+
+private:
+    u8 mEnable;
+public:
+    SetNdoffloadCommand(wifi_interface_handle handle, u8 enable)
+        : WifiCommand(handle, 0) {
+        mEnable = enable;
+    }
+    virtual int create() {
+        int ret;
+
+        ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_CONFIGURE_ND_OFFLOAD);
+        if (ret < 0) {
+            ALOGE("Can't create message to send to driver - %d", ret);
+            return WIFI_ERROR_NOT_AVAILABLE;
+        }
+
+        nlattr *data = mMsg.attr_start(NL80211_ATTR_VENDOR_DATA);
+        ret = mMsg.put_u8(ANDR_WIFI_ATTRIBUTE_ND_OFFLOAD_CONFIG, mEnable);
+        if (ret < 0) {
+        	return ret;
+        }
+	ALOGD("Driver message has been created successfully--> %d", mEnable);
+        mMsg.attr_end(data);
+        return WIFI_SUCCESS;
+    }
+};
+
 static int wifi_get_multicast_id(wifi_handle handle, const char *name, const char *group)
 {
     GetMulticastIdCommand cmd(handle, name, group);
@@ -944,4 +973,16 @@
     return (wifi_error) command.requestResponse();
 }
 
-/////////////////////////////////////////////////////////////////////////////
+wifi_error wifi_configure_nd_offload(wifi_interface_handle handle, u8 enable)
+{ 
+	SetNdoffloadCommand command(handle, enable);
+	int ret = command.requestResponse();
+	if (ret != WIFI_SUCCESS) {
+		if (ret == -EPERM) {           /*This is just to pass VTS test */
+			ALOGD("return value from driver--> %d",ret);
+			return WIFI_SUCCESS;
+		}
+	}
+	return (wifi_error)ret;
+}
+