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

Commit 03b35ccb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

appletalk: convert aarp to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ac32e1b

net/appletalk/aarp.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -443,13 +443,14 @@ static void aarp_send_probe_phase1(struct atalk_iface *iface) 
{

{

	struct ifreq atreq;

	struct ifreq atreq;

	struct sockaddr_at *sa = (struct sockaddr_at *)&atreq.ifr_addr;

	struct sockaddr_at *sa = (struct sockaddr_at *)&atreq.ifr_addr;

	const struct net_device_ops *ops = iface->dev->netdev_ops;





	sa->sat_addr.s_node = iface->address.s_node;

	sa->sat_addr.s_node = iface->address.s_node;

	sa->sat_addr.s_net = ntohs(iface->address.s_net);

	sa->sat_addr.s_net = ntohs(iface->address.s_net);





	/* We pass the Net:Node to the drivers/cards by a Device ioctl. */

	/* We pass the Net:Node to the drivers/cards by a Device ioctl. */

	if (!(iface->dev->do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {

	if (!(ops->ndo_do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {

		(void)iface->dev->do_ioctl(iface->dev, &atreq, SIOCGIFADDR);

		ops->ndo_do_ioctl(iface->dev, &atreq, SIOCGIFADDR);

		if (iface->address.s_net != htons(sa->sat_addr.s_net) ||

		if (iface->address.s_net != htons(sa->sat_addr.s_net) ||

		    iface->address.s_node != sa->sat_addr.s_node)

		    iface->address.s_node != sa->sat_addr.s_node)

			iface->status |= ATIF_PROBE_FAIL;

			iface->status |= ATIF_PROBE_FAIL;