mac80211: clean up return value of __ieee80211_parse_tx_radiotap
Johannes Berg
maintainerPATCH 1/1 mac80211: clean up return value of __ieee80211_parse_tx_radiotap
The return type has more than two values, but it can validly only ever return TX_DROP and TX_CONTINUE, so use a bool instead of ieee80211_tx_result.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/tx.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/mac80211/tx.c +5 -6
@@ -908,9 +908,8 @@ ieee80211_tx_h_stats(struct ieee80211_tx* deal with packet injection down monitor interface * with Radiotap Header -- only called for monitor mode interface */ -static ieee80211_tx_result -__ieee80211_parse_tx_radiotap (struct ieee80211_tx_data *tx, -struct sk_buff *skb) +static bool __ieee80211_parse_tx_radiotap (struct ieee80211_tx_data *tx, +struct sk_buff *skb) {/* * this is the moment to interpret and discard the radiotap header that
@@ -983,7 +982,7 @@ __ieee80211_parse_tx_radiotap(struct iee }if (ret != -ENOENT )/* ie, if we didn't simply run out of fields */ -return TX_DROP ; +return false;/* * remove the radiotap header
@@ -992,7 +991,7 @@ __ieee80211_parse_tx_radiotap(struct iee*/ skb_pull (skb, iterator.max_length); -return TX_CONTINUE ; +return true; }/*
@@ -1026,7 +1025,7 @@ __ieee80211_tx_prepare(struct ieee80211_/* process and remove the injection radiotap header */ sdata =IEEE80211_DEV_TO_SUB_IF (dev);if (unlikely (info->flags &IEEE80211_TX_CTL_INJECTED )) { -if (__ieee80211_parse_tx_radiotap (tx, skb) ==TX_DROP ) +if (!__ieee80211_parse_tx_radiotap (tx, skb))return TX_DROP ;/*
Johannes Berg
maintainerPATCH v2 1/1 mac80211: clean up return value of __ieee80211_parse_tx_radiotap
The return type has more than two values, but it can validly only ever return TX_DROP and TX_CONTINUE, so use a bool instead of ieee80211_tx_result.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/tx.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
net/mac80211/tx.c +6 -7
@@ -908,9 +908,8 @@ ieee80211_tx_h_stats(struct ieee80211_tx* deal with packet injection down monitor interface * with Radiotap Header -- only called for monitor mode interface */ -static ieee80211_tx_result -__ieee80211_parse_tx_radiotap (struct ieee80211_tx_data *tx, -struct sk_buff *skb) +static bool __ieee80211_parse_tx_radiotap (struct ieee80211_tx_data *tx, +struct sk_buff *skb) {/* * this is the moment to interpret and discard the radiotap header that
@@ -961,7 +960,7 @@ __ieee80211_parse_tx_radiotap(struct iee* on transmission */ if (skb->len < (iterator.max_length +FCS_LEN )) -return TX_DROP ; +return false;skb_trim (skb, skb->len -FCS_LEN ); }
@@ -983,7 +982,7 @@ __ieee80211_parse_tx_radiotap(struct iee }if (ret != -ENOENT )/* ie, if we didn't simply run out of fields */ -return TX_DROP ; +return false;/* * remove the radiotap header
@@ -992,7 +991,7 @@ __ieee80211_parse_tx_radiotap(struct iee*/ skb_pull (skb, iterator.max_length); -return TX_CONTINUE ; +return true; }/*
@@ -1026,7 +1025,7 @@ __ieee80211_tx_prepare(struct ieee80211_/* process and remove the injection radiotap header */ sdata =IEEE80211_DEV_TO_SUB_IF (dev);if (unlikely (info->flags &IEEE80211_TX_CTL_INJECTED )) { -if (__ieee80211_parse_tx_radiotap (tx, skb) ==TX_DROP ) +if (!__ieee80211_parse_tx_radiotap (tx, skb))return TX_DROP ;/*