android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Updated mdebeljuh patch from http://forum.xda-developers.com/showthread.php?t=819819"

Browse Source 
This reverts commit 5a97d475ff67e8c978fcbd72e506703b1511723c.
This commit is contained in:
Jon Benson 2010-10-30 11:58:27 +11:00
parent 587ec9fb57
commit 90731a9200
1 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/mach-msm/board-htcleo-wifi-nvs.c
View File

@ -27,12 +27,6 @@
#define NVS_MAX_SIZE 0x800U
#define NVS_MACADDR_SIZE 0x1AU
#define WLAN_SKB_BUF_NUM 16
//---------PATCH for mac address------------
#define MAC_ADDRESS_LEN_C 17
#define ETHER_ADDR_LEN 6
//------------------------------------------
static unsigned char wifi_nvs_ram[NVS_MAX_SIZE];
static struct proc_dir_entry *wifi_calibration;
@ -77,37 +71,6 @@ static unsigned char *hardcoded_nvs =
static struct proc_dir_entry *wifi_calibration;
//---------PATCH for mac address-----------------
static char htcleo_mac_address_c[MAC_ADDRESS_LEN_C+1];
int user_mac_address = 0;
static int __init htcleo_macaddress_setup(char *bootconfig)
{
int ret;
unsigned int tmp[ETHER_ADDR_LEN];
printk("%s: cmdline mac config=%s | %s\n",__FUNCTION__, bootconfig, __FILE__);
strncpy(htcleo_mac_address_c, bootconfig, MAC_ADDRESS_LEN_C);
ret = sscanf(htcleo_mac_address_c, "%2x:%2x:%2x:%2x:%2x:%2x", tmp, tmp+1, tmp+2, tmp+3, tmp+4, tmp+5);
if (ret==ETHER_ADDR_LEN)
{
strcpy(nvs_mac_addr, "macaddr=");
strcat(nvs_mac_addr, htcleo_mac_address_c);
strcat(nvs_mac_addr, "\n");
printk("%s parsed macaddr=%s | %s\n",__FUNCTION__,nvs_mac_addr, __FILE__);
user_mac_address = 1;
}
printk("%s parsed mac_address=%2x:%2x:%2x:%2x:%2x:%2x | %s\n",__FUNCTION__,
tmp[0], tmp[1], tmp[2],
tmp[3], tmp[4], tmp[5], __FILE__);
return 1;
}
__setup("wifi.mac_address=", htcleo_macaddress_setup);
//------------------------------------------
unsigned char *get_wifi_nvs_ram( void )
{
return hardcoded_nvs;
@ -152,8 +115,7 @@ static int parse_tag_msm_wifi(void)
else
maddr++;
}
if (!user_mac_address)
if((char*)maddr<(char*)(wifi_nvs_ram+NVS_MAX_SIZE-NVS_MACADDR_SIZE)) nvs_mac_addr = maddr;
if((char*)maddr<(char*)(wifi_nvs_ram+NVS_MAX_SIZE-NVS_MACADDR_SIZE)) nvs_mac_addr = maddr;
#ifdef NVS_MSM_WIFI_DEBUG