diff --git a/[refs] b/[refs]
index 5a3bb1023a31..c3504a0ed630 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e03e5ffd8d3327d23d76be5d63cfbbb537b1af59
+refs/heads/master: 60fd2b67014440091770ac5738301c7fa4c4159c
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index 5be9ed7ae1e9..25550692dda6 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/net/wireless/util.c
@@ -258,7 +258,7 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb)
 }
 EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
 
-int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
+static int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
 {
 	int ae = meshhdr->flags & MESH_FLAGS_AE;
 	/* 7.1.3.5a.2 */