projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sfc: Use canonical pointer type for MAC address in efx_set_mac_address()
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
sfc
/
efx.c
diff --git
a/drivers/net/ethernet/sfc/efx.c
b/drivers/net/ethernet/sfc/efx.c
index 83d4643470213b7f2380b2fcaadb8404f6d08dc4..91acdc28b247bc3151a3abc06857e79221fb0053 100644
(file)
--- a/
drivers/net/ethernet/sfc/efx.c
+++ b/
drivers/net/ethernet/sfc/efx.c
@@
-503,8
+503,6
@@
static int efx_probe_channel(struct efx_channel *channel)
goto fail;
}
goto fail;
}
- channel->n_rx_frm_trunc = 0;
-
return 0;
fail:
return 0;
fail:
@@
-2115,7
+2113,7
@@
static int efx_set_mac_address(struct net_device *net_dev, void *data)
{
struct efx_nic *efx = netdev_priv(net_dev);
struct sockaddr *addr = data;
{
struct efx_nic *efx = netdev_priv(net_dev);
struct sockaddr *addr = data;
-
char
*new_addr = addr->sa_data;
+
u8
*new_addr = addr->sa_data;
if (!is_valid_ether_addr(new_addr)) {
netif_err(efx, drv, efx->net_dev,
if (!is_valid_ether_addr(new_addr)) {
netif_err(efx, drv, efx->net_dev,