From c193655d294029cf36dd70aecd9b9674915001f8 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 23 Dec 2007 10:11:55 +0100 Subject: [PATCH] --- yaml --- r: 78697 b: refs/heads/master c: 6d65f5db2f66e3ff44df759fbbb3c7482879fb1e h: refs/heads/master i: 78695: 7ea8df325a40f4cc97e053b83b75c799915d3c76 v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3eb5cc987a94..835ddd38f295 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1036d8642b6bb604774ea143120fe10ede4ab078 +refs/heads/master: 6d65f5db2f66e3ff44df759fbbb3c7482879fb1e diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 8302c70da9a4..f6194167253d 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -932,7 +932,6 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_hdr *hdr; struct ieee80211_sub_if_data *sdata; - ieee80211_txrx_result res = TXRX_CONTINUE; int hdrlen; @@ -997,7 +996,7 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx, } control->flags |= IEEE80211_TXCTL_FIRST_FRAGMENT; - return res; + return TXRX_CONTINUE; } /* Device in tx->dev has a reference added; use dev_put(tx->dev) when