diff --git a/[refs] b/[refs] index 589e235bc791..0352cb6cbbb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e920b4505105b710f8d4a535ec02c4078f8e2e +refs/heads/master: 171243612f1612402fbf83f3f034a1beefcdea61 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 37eda7e00e03..ec8f53467374 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -175,12 +175,6 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, return cpu_to_le16(dur); } -static inline int is_ieee80211_device(struct ieee80211_local *local, - struct net_device *dev) -{ - return local == wdev_priv(dev->ieee80211_ptr); -} - /* tx handlers */ static ieee80211_tx_result debug_noinline ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)