[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: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/irda/irlan_eth.h b/include/net/irda/irlan_eth.h
index 0062347600b9d7796cc969c20651e7115009fed1..de5c81691f337b6a59eb88ca2f8777d3bcae3d1f 100644 (file)
--- a/include/net/irda/irlan_eth.h
+++ b/include/net/irda/irlan_eth.h
@@ -29,5 +29,4 @@ struct net_device *alloc_irlandev(const char *name);
 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_send_gratuitous_arp(struct net_device *dev);
 #endif

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 75bb6a9dcaaac1401e9e3cef4e87dfe385b76085..9a1cd87e71426aaa1c8f4d22318c090a39976683 100644 (file)
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -54,13 +54,6 @@
 #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[]; */
 
 /*
@@ -393,9 +386,6 @@ static void irlan_connect_confirm(void *instance, void *sap,
        /* Ready to transfer Ethernet frames */
        netif_start_queue(self->dev);
        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);
 }
 

diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 7a6b14ab1e7f0633fc5673ed66d326a484076dab..05112be99569f3eab7eb785cbbc00c9a0e749ec8 100644 (file)
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -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)
  *