From: Johannes Berg Date: Sun, 23 Dec 2007 09:11:55 +0000 (+0100) Subject: mac80211: remove misleading 'res' variable X-Git-Tag: v2.6.25-rc1~1162^2~851 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6d65f5db2f66e3ff44df759fbbb3c7482879fb1e;p=linux-2.6-omap-h63xx.git mac80211: remove misleading 'res' variable When this function returns != CONTINUE, it needs to put the station struct it has acquired. Hence, having this unused variable is not just superfluous but also misleading. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: David S. Miller --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8302c70da9a..f6194167253 100644 --- a/net/mac80211/tx.c +++ b/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