Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / net / irda / irlan / irlan_common.c

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);
 }