diff --git a/[refs] b/[refs]
index 63aedab635be..f21f6fbc2eba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6c7658ef8888e82608265d8098d09807997f771
+refs/heads/master: 1196862b7926d5312c7f8e8eaecba658b6553ba0
diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c b/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c
index c6124fcf27b7..c788377f5648 100644
--- a/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/trunk/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -83,13 +83,6 @@ ieee80211softmac_assoc_timeout(void *d)
 	ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT, NULL);
 }
 
-static void
-ieee80211softmac_reassoc(struct ieee80211softmac_device *mac)
-{
-	function_enter();
-}
-
-
 /* Sends out a disassociation request to the desired AP */
 static void
 ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason)