aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-09-05 04:56:35 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-09-05 04:56:50 -0400
commitc10a19930f286a24f4994c83fe71866877fb1a71 (patch)
tree633bcca8319360bb1e4058c3f1be429c811262d7 /net/mac80211/ieee80211_i.h
parent4549cf2b1803d29cfd019f7bfeaa784f8f9c558f (diff)
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 <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
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,
1917 size_t extra_ies_len); 1917 size_t extra_ies_len);
1918int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, 1918int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
1919 const u8 *peer, enum nl80211_tdls_operation oper); 1919 const u8 *peer, enum nl80211_tdls_operation oper);
1920 1920void ieee80211_tdls_peer_del_work(struct work_struct *wk);
1921 1921
1922extern const struct ethtool_ops ieee80211_ethtool_ops; 1922extern const struct ethtool_ops ieee80211_ethtool_ops;
1923 1923
@@ -1928,4 +1928,3 @@ extern const struct ethtool_ops ieee80211_ethtool_ops;
1928#endif 1928#endif
1929 1929
1930#endif /* IEEE80211_I_H */ 1930#endif /* IEEE80211_I_H */
1931void ieee80211_tdls_peer_del_work(struct work_struct *wk);