* [PATCH] mac80211: clean up ieee80211_i.h
@ 2014-09-04 18:04 Emmanuel Grumbach
2014-09-04 18:18 ` Emmanuel Grumbach
0 siblings, 1 reply; 3+ messages in thread
From: Emmanuel Grumbach @ 2014-09-04 18:04 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Emmanuel Grumbach
Not sure how the declaration of ieee80211_tdls_peer_del_work
landed after the double inclusion protection end.
Change-Id: I465fd6f00bb13bd598fe394e59b01ca842f19266
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
net/mac80211/ieee80211_i.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c8482e0..95469c4 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1950,6 +1950,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;
@@ -1960,4 +1961,3 @@ extern const struct ethtool_ops ieee80211_ethtool_ops;
#endif
#endif /* IEEE80211_I_H */
-void ieee80211_tdls_peer_del_work(struct work_struct *wk);
--
1.8.1.msysgit.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] mac80211: clean up ieee80211_i.h
2014-09-04 18:04 [PATCH] mac80211: clean up ieee80211_i.h Emmanuel Grumbach
@ 2014-09-04 18:18 ` Emmanuel Grumbach
2014-09-05 8:57 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Emmanuel Grumbach @ 2014-09-04 18:18 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Emmanuel Grumbach
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>
---
v2: without the Change ID line this time
---
net/mac80211/ieee80211_i.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c8482e0..95469c4 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1950,6 +1950,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;
@@ -1960,4 +1961,3 @@ extern const struct ethtool_ops ieee80211_ethtool_ops;
#endif
#endif /* IEEE80211_I_H */
-void ieee80211_tdls_peer_del_work(struct work_struct *wk);
--
1.8.1.msysgit.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mac80211: clean up ieee80211_i.h
2014-09-04 18:18 ` Emmanuel Grumbach
@ 2014-09-05 8:57 ` Johannes Berg
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Berg @ 2014-09-05 8:57 UTC (permalink / raw)
To: Emmanuel Grumbach; +Cc: linux-wireless
On Thu, 2014-09-04 at 21:18 +0300, Emmanuel Grumbach wrote:
> Not sure how the declaration of ieee80211_tdls_peer_del_work
> landed after the double inclusion protection end.
Applied, thanks.
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-05 8:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-04 18:04 [PATCH] mac80211: clean up ieee80211_i.h Emmanuel Grumbach
2014-09-04 18:18 ` Emmanuel Grumbach
2014-09-05 8:57 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).