Commit ed088907 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: fjes: constify and use eth_hw_addr_set() 



Get it ready for constant netdev->dev_addr.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2e0566ae

drivers/net/fjes/fjes_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static void fjes_hw_free_epbuf(struct epbuf_handler *epbh) 
	epbh->ring = NULL;

}



void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, u8 *mac_addr, u32 mtu)

void fjes_hw_setup_epbuf(struct epbuf_handler *epbh, const u8 *mac_addr,

			 u32 mtu)

{

	union ep_buffer_info *info = epbh->info;

	u16 vlan_id[EP_BUFFER_SUPPORT_VLAN_MAX];

drivers/net/fjes/fjes_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ int fjes_hw_register_buff_addr(struct fjes_hw *, int, 
int fjes_hw_unregister_buff_addr(struct fjes_hw *, int);

void fjes_hw_init_command_registers(struct fjes_hw *,

				    struct fjes_device_command_param *);

void fjes_hw_setup_epbuf(struct epbuf_handler *, u8 *, u32);

void fjes_hw_setup_epbuf(struct epbuf_handler *, const u8 *, u32);

int fjes_hw_raise_interrupt(struct fjes_hw *, int, enum REG_ICTL_MASK);

void fjes_hw_set_irqmask(struct fjes_hw *, enum REG_ICTL_MASK, bool);

u32 fjes_hw_capture_interrupt_status(struct fjes_hw *);

drivers/net/fjes/fjes_main.c

+8 −6
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ static int fjes_probe(struct platform_device *plat_dev) 
	struct net_device *netdev;

	struct resource *res;

	struct fjes_hw *hw;

	u8 addr[ETH_ALEN];

	int err;



	err = -ENOMEM;
@@ -1266,12 +1267,13 @@ static int fjes_probe(struct platform_device *plat_dev) 
		goto err_free_control_wq;



	/* setup MAC address (02:00:00:00:00:[epid])*/

	netdev->dev_addr[0] = 2;

	netdev->dev_addr[1] = 0;

	netdev->dev_addr[2] = 0;

	netdev->dev_addr[3] = 0;

	netdev->dev_addr[4] = 0;

	netdev->dev_addr[5] = hw->my_epid; /* EPID */

	addr[0] = 2;

	addr[1] = 0;

	addr[2] = 0;

	addr[3] = 0;

	addr[4] = 0;

	addr[5] = hw->my_epid; /* EPID */

	eth_hw_addr_set(netdev, addr);



	err = register_netdev(netdev);

	if (err)