From: Johannes Berg Date: Fri, 5 Sep 2014 08:56:35 +0000 (+0200) Subject: mac80211: clean up ieee80211_i.h X-Git-Tag: v3.18-rc1~10^2~75^2~133^2~29 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=c10a19930f286a24f4994c83fe71866877fb1a71;hp=4549cf2b1803d29cfd019f7bfeaa784f8f9c558f;p=cascardo%2Flinux.git mac80211: clean up ieee80211_i.h Not sure how the declaration of ieee80211_tdls_peer_del_work landed after the double inclusion protection end. Signed-off-by: Emmanuel Grumbach Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 8fe5433f0d35..78f95387e43f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1917,7 +1917,7 @@ int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, size_t extra_ies_len); int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, const u8 *peer, enum nl80211_tdls_operation oper); - +void ieee80211_tdls_peer_del_work(struct work_struct *wk); extern const struct ethtool_ops ieee80211_ethtool_ops; @@ -1928,4 +1928,3 @@ extern const struct ethtool_ops ieee80211_ethtool_ops; #endif #endif /* IEEE80211_I_H */ -void ieee80211_tdls_peer_del_work(struct work_struct *wk);