2 files changed, 0 insertions, 43 deletions

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 75bb6a9dcaaa..9a1cd87e7142 100644
--- 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 7a6b14ab1e7f..05112be99569 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -289,39 +289,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)
  *
  *    Configure the filtering of the device