From d9e6eedea576d55ec050676ce477dbd8c34a6ec2 Mon Sep 17 00:00:00 2001
From: Moritz Muehlenhoff <jmm@debian.org>
Date: Mon, 9 Feb 2009 19:33:43 +0100
Subject: [PATCH] --- yaml --- r: 141218 b: refs/heads/master c:
 3897cd0c4050b8fd86ebb98ce5c7cc8dc00813c3 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/staging/wlan-ng/p80211netdev.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 0906827af8f6..caddc192f239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c98f718786c3c6d03ee377b62838fff3cc8f573
+refs/heads/master: 3897cd0c4050b8fd86ebb98ce5c7cc8dc00813c3
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.c b/trunk/drivers/staging/wlan-ng/p80211netdev.c
index 1f166b3da797..0fc71710dd43 100644
--- a/trunk/drivers/staging/wlan-ng/p80211netdev.c
+++ b/trunk/drivers/staging/wlan-ng/p80211netdev.c
@@ -755,12 +755,6 @@ int wlan_setup(wlandevice_t *wlandev)
 		dev->ml_priv = wlandev;
 		dev->hard_start_xmit = p80211knetdev_hard_start_xmit;
 		dev->get_stats = p80211knetdev_get_stats;
-#ifdef HAVE_PRIVATE_IOCTL
-		dev->do_ioctl = p80211knetdev_do_ioctl;
-#endif
-#ifdef HAVE_MULTICAST
-		dev->set_multicast_list = p80211knetdev_set_multicast_list;
-#endif
 		dev->init = p80211knetdev_init;
 		dev->open = p80211knetdev_open;
 		dev->stop = p80211knetdev_stop;
@@ -771,16 +765,6 @@ int wlan_setup(wlandevice_t *wlandev)
 		dev->wireless_handlers = &p80211wext_handler_def;
 
 		netif_stop_queue(dev);
-#ifdef HAVE_CHANGE_MTU
-		dev->change_mtu = wlan_change_mtu;
-#endif
-#ifdef HAVE_SET_MAC_ADDR
-		dev->set_mac_address = p80211knetdev_set_mac_address;
-#endif
-#ifdef HAVE_TX_TIMEOUT
-		dev->tx_timeout = &p80211knetdev_tx_timeout;
-		dev->watchdog_timeo = (wlan_watchdog * HZ) / 1000;
-#endif
 		netif_carrier_off(dev);
 	}