add r8169 read mac form eeprom

hc

2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd

 kernel/drivers/net/wireless/intel/iwlwifi/cfg/1000.c
..
..
@@ -1,23 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /******************************************************************************
2
3
  *
3
4
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
4
- * Copyright(c) 2018 Intel Corporation
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of version 2 of the GNU General Public License as
8
- * published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
13
- * more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along with
16
- * this program; if not, write to the Free Software Foundation, Inc.,
17
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
18
- *
19
- * The full GNU General Public License is included in this distribution in the
20
- * file called LICENSE.
5
+ * Copyright(c) 2018 - 2019 Intel Corporation
21
6
  *
22
7
  * Contact Information:
23
8
  *  Intel Linux Wireless <linuxwifi@intel.com>
..
..
@@ -52,7 +37,7 @@
52
37
 static const struct iwl_base_params iwl1000_base_params = {
53
38
 	.num_of_queues = IWLAGN_NUM_QUEUES,
54
39
 	.max_tfd_queue_size = 256,
55
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
40
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
56
41
 	.pll_cfg = true,
57
42
 	.max_ll_items = OTP_MAX_LL_ITEMS_1000,
58
43
 	.shadow_ram_support = false,
..
..
@@ -84,16 +69,15 @@
84
69
 	.fw_name_pre = IWL1000_FW_PRE,				\
85
70
 	.ucode_api_max = IWL1000_UCODE_API_MAX,			\
86
71
 	.ucode_api_min = IWL1000_UCODE_API_MIN,			\
87
-	.device_family = IWL_DEVICE_FAMILY_1000,		\
72
+	.trans.device_family = IWL_DEVICE_FAMILY_1000,		\
88
73
 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
89
74
 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\
90
75
 	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\
91
76
 	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\
92
-	.base_params = &iwl1000_base_params,			\
77
+	.trans.base_params = &iwl1000_base_params,		\
93
78
 	.eeprom_params = &iwl1000_eeprom_params,		\
94
79
 	.led_mode = IWL_LED_BLINK,				\
95
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
96
-	.csr = &iwl_csr_v1
80
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
97
81
 
98
82
 const struct iwl_cfg iwl1000_bgn_cfg = {
99
83
 	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
..
..
@@ -110,17 +94,16 @@
110
94
 	.fw_name_pre = IWL100_FW_PRE,				\
111
95
 	.ucode_api_max = IWL100_UCODE_API_MAX,			\
112
96
 	.ucode_api_min = IWL100_UCODE_API_MIN,			\
113
-	.device_family = IWL_DEVICE_FAMILY_100,			\
97
+	.trans.device_family = IWL_DEVICE_FAMILY_100,		\
114
98
 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
115
99
 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\
116
100
 	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\
117
101
 	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\
118
-	.base_params = &iwl1000_base_params,			\
102
+	.trans.base_params = &iwl1000_base_params,		\
119
103
 	.eeprom_params = &iwl1000_eeprom_params,		\
120
104
 	.led_mode = IWL_LED_RF_STATE,				\
121
105
 	.rx_with_siso_diversity = true,				\
122
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
123
-	.csr = &iwl_csr_v1
106
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
124
107
 
125
108
 const struct iwl_cfg iwl100_bgn_cfg = {
126
109
 	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",