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

Commit 7ef3abd2 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[IRDA]: Remove irlan_eth_send_gratuitous_arp() 



Even kernel 2.2.26 (sic) already contains the
  #undef CONFIG_IRLAN_SEND_GRATUITOUS_ARP
with the comment "but for some reason the machine crashes if you use DHCP".

Either someone finally looks into this or it's simply time to remove 
this dead code.

Reported-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99971e70

include/net/irda/irlan_eth.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -29,5 +29,4 @@ struct net_device *alloc_irlandev(const char *name); 
int  irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb);

int  irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb);





void irlan_eth_flow_indication( void *instance, void *sap, LOCAL_FLOW flow);

void irlan_eth_flow_indication( void *instance, void *sap, LOCAL_FLOW flow);

void irlan_eth_send_gratuitous_arp(struct net_device *dev);

#endif
 
#endif

net/irda/irlan/irlan_common.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -54,13 +54,6 @@ 
#include <net/irda/irlan_filter.h>

#include <net/irda/irlan_filter.h>









/*

 * Send gratuitous ARP when connected to a new AP or not. May be a clever

 * thing to do, but for some reason the machine crashes if you use DHCP. So

 * lets not use it by default.

 */

#undef CONFIG_IRLAN_SEND_GRATUITOUS_ARP



/* extern char sysctl_devname[]; */

/* extern char sysctl_devname[]; */





/*

/*
@@ -393,9 +386,6 @@ static void irlan_connect_confirm(void *instance, void *sap, 
	/* Ready to transfer Ethernet frames */

	/* Ready to transfer Ethernet frames */

	netif_start_queue(self->dev);

	netif_start_queue(self->dev);

	self->disconnect_reason = 0; /* Clear reason */

	self->disconnect_reason = 0; /* Clear reason */

#ifdef CONFIG_IRLAN_SEND_GRATUITOUS_ARP

	irlan_eth_send_gratuitous_arp(&self->dev);

#endif

	wake_up_interruptible(&self->open_wait);

	wake_up_interruptible(&self->open_wait);

}

}

net/irda/irlan/irlan_eth.c

+0 −33
Original line number Original line Diff line number Diff line
@@ -288,39 +288,6 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow) 
	}

	}

}

}





/*

 * Function irlan_etc_send_gratuitous_arp (dev)

 *

 *    Send gratuitous ARP to announce that we have changed

 *    hardware address, so that all peers updates their ARP tables

 */

void irlan_eth_send_gratuitous_arp(struct net_device *dev)

{

#ifdef CONFIG_INET

	struct in_device *in_dev;



	/*

	 * When we get a new MAC address do a gratuitous ARP. This

	 * is useful if we have changed access points on the same

	 * subnet.

	 */

	IRDA_DEBUG(4, "IrLAN: Sending gratuitous ARP\n");

	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);

	if (in_dev == NULL)

		goto out;

	if (in_dev->ifa_list)



	arp_send(ARPOP_REQUEST, ETH_P_ARP,

		 in_dev->ifa_list->ifa_address,

		 dev,

		 in_dev->ifa_list->ifa_address,

		 NULL, dev->dev_addr, NULL);

out:

	rcu_read_unlock();

#endif /* CONFIG_INET */

}



/*

/*

 * Function set_multicast_list (dev)

 * Function set_multicast_list (dev)

 *

 *