Commit 45bd1c5b authored by 谢致邦 (XIE Zhibang)'s avatar 谢致邦 (XIE Zhibang) Committed by David S. Miller
Browse files

net: appletalk: Drop aarp_send_probe_phase1() 



aarp_send_probe_phase1() used to work by calling ndo_do_ioctl of
appletalk drivers ltpc or cops, but these two drivers have been removed
since the following commits:
commit 03dcb90d ("net: appletalk: remove Apple/Farallon LocalTalk PC
support")
commit 00f3696f ("net: appletalk: remove cops support")

Thus aarp_send_probe_phase1() no longer works, so drop it. (found by
code inspection)

Signed-off-by: default avatar谢致邦 (XIE Zhibang) <Yeking@Red54.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 544c9394

net/appletalk/aarp.c

+7 −38
Original line number Diff line number Diff line
@@ -432,38 +432,8 @@ static struct atalk_addr *__aarp_proxy_find(struct net_device *dev, 
	return a ? sa : NULL;

}



/*

 * Probe a Phase 1 device or a device that requires its Net:Node to

 * be set via an ioctl.

 */

static void aarp_send_probe_phase1(struct atalk_iface *iface)

{

	struct ifreq atreq;

	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_net = ntohs(iface->address.s_net);



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

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

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

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

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

			iface->status |= ATIF_PROBE_FAIL;



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

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

	}

}





void aarp_probe_network(struct atalk_iface *atif)

{

	if (atif->dev->type == ARPHRD_LOCALTLK ||

	    atif->dev->type == ARPHRD_PPP)

		aarp_send_probe_phase1(atif);

	else {

	unsigned int count;



	for (count = 0; count < AARP_RETRANSMIT_LIMIT; count++) {
@@ -476,7 +446,6 @@ void aarp_probe_network(struct atalk_iface *atif) 
			break;

	}

}

}



int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)

{