diff --git a/[refs] b/[refs] index ff726f4df814..6bb96f061e0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c99f3e4cfc3190e01c55e72d15a837d9dc41426 +refs/heads/master: b0dee5784dff3e2984510a7fe7a7e48109001f94 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index c489865761bc..77e7b014872b 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -1379,7 +1379,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) return RX_QUEUED; } -static ieee80211_rx_result debug_noinline +static ieee80211_rx_result ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) { struct ieee80211_hdr *hdr;