Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e834da9a authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by David S. Miller
Browse files

hv_netvsc: pass struct net_device to rndis_filter_set_device_mac() 



We unpack 'struct net_device' in netvsc_set_mac_addr() to get to
'struct hv_device' pointer which we use in rndis_filter_set_device_mac()
to get back to 'struct net_device'.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f5fa6c8

drivers/net/hyperv/hyperv_net.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ int rndis_filter_receive(struct hv_device *dev, 
			struct vmbus_channel *channel);



int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter);

int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac);

int rndis_filter_set_device_mac(struct net_device *ndev, char *mac);



void netvsc_switch_datapath(struct net_device *nv_dev, bool vf);

drivers/net/hyperv/netvsc_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -982,8 +982,6 @@ static struct rtnl_link_stats64 *netvsc_get_stats64(struct net_device *net, 


static int netvsc_set_mac_addr(struct net_device *ndev, void *p)

{

	struct net_device_context *ndevctx = netdev_priv(ndev);

	struct hv_device *hdev =  ndevctx->device_ctx;

	struct sockaddr *addr = p;

	char save_adr[ETH_ALEN];

	unsigned char save_aatype;
@@ -996,7 +994,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p) 
	if (err != 0)

		return err;



	err = rndis_filter_set_device_mac(hdev, addr->sa_data);

	err = rndis_filter_set_device_mac(ndev, addr->sa_data);

	if (err != 0) {

		/* roll back to saved MAC */

		memcpy(ndev->dev_addr, save_adr, ETH_ALEN);

drivers/net/hyperv/rndis_filter.c

+1 −2
Original line number Diff line number Diff line
@@ -543,9 +543,8 @@ static int rndis_filter_query_device_mac(struct rndis_device *dev) 
#define NWADR_STR "NetworkAddress"

#define NWADR_STRLEN 14



int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac)

int rndis_filter_set_device_mac(struct net_device *ndev, char *mac)

{

	struct net_device *ndev = hv_get_drvdata(hdev);

	struct netvsc_device *nvdev = net_device_to_netvsc_device(ndev);

	struct rndis_device *rdev = nvdev->extension;

	struct rndis_request *request;