diff --git a/rootdir/etc/init.lge.usb.rc b/rootdir/etc/init.lge.usb.rc
diff --git a/rootdir/etc/init.lge.usb.sh b/rootdir/etc/init.lge.usb.sh
diff --git a/rootdir/etc/init.qcom.class_core.sh b/rootdir/etc/init.qcom.class_core.sh
diff --git a/rootdir/etc/init.qcom.early_boot.sh b/rootdir/etc/init.qcom.early_boot.sh
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
diff --git a/rootdir/etc/init.qcom.sh b/rootdir/etc/init.qcom.sh
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
diff --git a/rootdir/etc/set_emmc_size.sh b/rootdir/etc/set_emmc_size.sh
diff --git a/rootdir/etc/ueventd.c50.rc b/rootdir/etc/ueventd.c50.rc
diff --git a/sepolicy/device.te b/sepolicy/device.te
diff --git a/sepolicy/file.te b/sepolicy/file.te
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
diff --git a/sepolicy/hostapd.te b/sepolicy/hostapd.te
diff --git a/sepolicy/init.te b/sepolicy/init.te
diff --git a/sepolicy/init_shell.te b/sepolicy/init_shell.te
diff --git a/sepolicy/kcal_dev.te b/sepolicy/kcal_dev.te
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
diff --git a/sepolicy/keystore.te b/sepolicy/keystore.te
diff --git a/sepolicy/lge_touch_sysfs.te b/sepolicy/lge_touch_sysfs.te
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
diff --git a/sepolicy/mm-pp-daemon.te b/sepolicy/mm-pp-daemon.te
diff --git a/sepolicy/mm-qcamerad.te b/sepolicy/mm-qcamerad.te
diff --git a/sepolicy/mpdecision.te b/sepolicy/mpdecision.te
diff --git a/sepolicy/netd.te b/sepolicy/netd.te
diff --git a/sepolicy/nfc.te b/sepolicy/nfc.te
diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te
diff --git a/sepolicy/property.te b/sepolicy/property.te
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
diff --git a/sepolicy/radio.te b/sepolicy/radio.te
diff --git a/sepolicy/rmt_storage.te b/sepolicy/rmt_storage.te
diff --git a/sepolicy/sensors.te b/sepolicy/sensors.te
diff --git a/sepolicy/servicemanager.te b/sepolicy/servicemanager.te
diff --git a/sepolicy/sysinit.te b/sepolicy/sysinit.te
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
diff --git a/sepolicy/tee.te b/sepolicy/tee.te
diff --git a/sepolicy/thermal-engine.te b/sepolicy/thermal-engine.te
diff --git a/sepolicy/ueventd.te b/sepolicy/ueventd.te
diff --git a/sepolicy/untrusted_app.te b/sepolicy/untrusted_app.te
diff --git a/sepolicy/vibe_data_file.te b/sepolicy/vibe_data_file.te
diff --git a/sepolicy/vold.te b/sepolicy/vold.te
diff --git a/sepolicy/wcnss_service.te b/sepolicy/wcnss_service.te
diff --git a/sepolicy/wpa.te b/sepolicy/wpa.te
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+export VENDOR=lge
+export DEVICE=c50
+./../../$VENDOR/msm8916-common/setup-makefiles.sh $@
diff --git a/system.prop b/system.prop
@@ -0,0 +1,5 @@
+# Radio
+rild.libargs=-d /dev/smd0
+rild.libpath=/vendor/lib/libril-qc-qmi-1.so
+telephony.lteOnGsmDevice=1
+ro.telephony.default_network=9
diff --git a/vendorsetup.sh b/vendorsetup.sh
@@ -1,2 +1 @@
 add_lunch_combo cm_c50-userdebug
-add_lunch_combo cm_c50-eng
diff --git a/libwcnss_qmi/Android.mk → wcnss/Android.mk b/libwcnss_qmi/Android.mk → wcnss/Android.mk
@@ -1,5 +1,4 @@
-#
-# Copyright (C) 2014 The CyanogenMod Project
+# Copyright (C) 2011 The CyanogenMod project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,21 +11,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 ifneq ($(filter c50,$(TARGET_DEVICE)),)
 
-LOCAL_PATH := $(call my-dir)
+LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := libwcnss_qmi.c
-
+LOCAL_SRC_FILES := wcnss_lge_client.c
 LOCAL_C_INCLUDES += hardware/qcom/wlan/wcnss_service
 LOCAL_CFLAGS += -Wall
-
 LOCAL_SHARED_LIBRARIES := libc libcutils libutils liblog
-
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libwcnss_qmi
 

diff --git a/libwcnss_qmi/libwcnss_qmi.c → wcnss/wcnss_lge_client.c b/libwcnss_qmi/libwcnss_qmi.c → wcnss/wcnss_lge_client.c
@@ -16,44 +16,58 @@
 
 //#define LOG_NDEBUG 0
 
-#define LOG_TAG "wcnss_c50"
+#define LOG_TAG "wcnss_lge"
+
+#define SUCCESS 0
+#define FAILED -1
+
+#define CALIBRATION_PATH "/dev/block/bootdevice/by-name/misc"
 
 #include <cutils/log.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 int wcnss_init_qmi(void)
 {
     /* empty */
-    return 0;
+    return SUCCESS;
 }
 
 int wcnss_qmi_get_wlan_address(unsigned char *pBdAddr)
 {
-	int fd1, fd2, fd3;
-	unsigned char macbyte;
+    FILE *fd;
+    int ret;
 
-	int i;
+    fd = fopen(CALIBRATION_PATH, "r");
+    if (fd == NULL) {
+        ALOGE("Failure opening calibration path: %d\n", errno);
+        return FAILED;
+    }
 
-	fd1 = open("/dev/block/platform/soc.0/by-name/misc",O_RDONLY);
+    fseek(fd, 0x3000, SEEK_SET);
 
-	for (i = 0; i < 6; i++) {
-		lseek(fd1,0x3000+i,SEEK_SET);
-		lseek(fd3,0,SEEK_END);
-		read(fd1,&pBdAddr[i],1);
-	}
-  	ALOGI("Found MAC address: %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",
+    ret = fread(pBdAddr, sizeof(pBdAddr[0]), 6, fd);
+
+    if (ret < 0) {
+        ALOGE("Failure to read calibration data: %d\n", errno);
+        fclose(fd);
+        return FAILED;
+    }
+
+    ALOGI("Found MAC address: %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",
             pBdAddr[0],
             pBdAddr[1],
             pBdAddr[2],
             pBdAddr[3],
             pBdAddr[4],
             pBdAddr[5]);
-	close(fd1);
-	return 0;
+
+    fclose(fd);
+
+    return SUCCESS;
 }
 
 void wcnss_qmi_deinit(void)