OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 41... Line 41...
41 ath10k-4.13/core.c | 40 ++++++++++++++++++++++++++++------ 41 ath10k-4.13/core.c | 40 ++++++++++++++++++++++++++++------
42 1 file changed, 33 insertions(+), 7 deletions(-) 42 1 file changed, 33 insertions(+), 7 deletions(-)
Line 43... Line 43...
43   43  
44 --- a/ath10k-4.13/core.c 44 --- a/ath10k-4.13/core.c
45 +++ b/ath10k-4.13/core.c 45 +++ b/ath10k-4.13/core.c
46 @@ -891,6 +891,28 @@ static int ath10k_core_check_smbios(stru 46 @@ -889,6 +889,28 @@ static int ath10k_core_check_smbios(stru
47 return 0; 47 return 0;
Line 48... Line 48...
48 } 48 }
49 49
Line 70... Line 70...
70 +} 70 +}
71 + 71 +
72 static int ath10k_download_and_run_otp(struct ath10k *ar) 72 static int ath10k_download_and_run_otp(struct ath10k *ar)
73 { 73 {
74 u32 result, address = ar->hw_params.patch_load_addr; 74 u32 result, address = ar->hw_params.patch_load_addr;
75 @@ -1530,19 +1552,19 @@ static int ath10k_core_create_board_name 75 @@ -1522,19 +1544,19 @@ static int ath10k_core_create_board_name
76 /* strlen(',variant=') + strlen(ar->id.bdf_ext) */ 76 /* strlen(',variant=') + strlen(ar->id.bdf_ext) */
77 char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 }; 77 char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };
Line 78... Line 78...
78 78
79 + if (ar->id.bdf_ext[0] != '\0') 79 + if (ar->id.bdf_ext[0] != '\0')
Line 96... Line 96...
96 - ar->id.bdf_ext); 96 - ar->id.bdf_ext);
97 - 97 -
98 scnprintf(name, name_len, 98 scnprintf(name, name_len,
99 "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s", 99 "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",
100 ath10k_bus_str(ar->hif.bus), 100 ath10k_bus_str(ar->hif.bus),
101 @@ -2975,7 +2997,11 @@ static int ath10k_core_probe_fw(struct a 101 @@ -2964,7 +2986,11 @@ static int ath10k_core_probe_fw(struct a
Line 102... Line 102...
102 102
103 ret = ath10k_core_check_smbios(ar); 103 ret = ath10k_core_check_smbios(ar);
104 if (ret) 104 if (ret)
105 - ath10k_dbg(ar, ATH10K_DBG_BOOT, "bdf variant name not set.\n"); 105 - ath10k_dbg(ar, ATH10K_DBG_BOOT, "bdf variant name not set.\n");