File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed
drivers/net/ethernet/natsemi Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -114,6 +114,7 @@ static int sonic_probe1(struct net_device *dev)
114
114
struct sonic_local * lp = netdev_priv (dev );
115
115
int err = - ENODEV ;
116
116
int i ;
117
+ unsigned char addr [ETH_ALEN ];
117
118
118
119
if (!request_mem_region (dev -> base_addr , SONIC_MEM_SIZE , jazz_sonic_string ))
119
120
return - EBUSY ;
@@ -143,9 +144,10 @@ static int sonic_probe1(struct net_device *dev)
143
144
SONIC_WRITE (SONIC_CEP ,0 );
144
145
for (i = 0 ; i < 3 ; i ++ ) {
145
146
val = SONIC_READ (SONIC_CAP0 - i );
146
- dev -> dev_addr [i * 2 ] = val ;
147
- dev -> dev_addr [i * 2 + 1 ] = val >> 8 ;
147
+ addr [i * 2 ] = val ;
148
+ addr [i * 2 + 1 ] = val >> 8 ;
148
149
}
150
+ eth_hw_addr_set (dev , addr );
149
151
150
152
lp -> dma_bitmode = SONIC_BITMODE32 ;
151
153
Original file line number Diff line number Diff line change @@ -127,6 +127,7 @@ static int __init sonic_probe1(struct net_device *dev)
127
127
unsigned int base_addr = dev -> base_addr ;
128
128
int i ;
129
129
int err = 0 ;
130
+ unsigned char addr [ETH_ALEN ];
130
131
131
132
if (!request_mem_region (base_addr , 0x100 , xtsonic_string ))
132
133
return - EBUSY ;
@@ -163,9 +164,10 @@ static int __init sonic_probe1(struct net_device *dev)
163
164
164
165
for (i = 0 ; i < 3 ; i ++ ) {
165
166
unsigned int val = SONIC_READ (SONIC_CAP0 - i );
166
- dev -> dev_addr [i * 2 ] = val ;
167
- dev -> dev_addr [i * 2 + 1 ] = val >> 8 ;
167
+ addr [i * 2 ] = val ;
168
+ addr [i * 2 + 1 ] = val >> 8 ;
168
169
}
170
+ eth_hw_addr_set (dev , addr );
169
171
170
172
lp -> dma_bitmode = SONIC_BITMODE32 ;
171
173
You can’t perform that action at this time.
0 commit comments