openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-06-09 19:48:25 +02:00 committed by John W. Linville
parent 0bffe40f21
commit 27004b10ce
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/mac80211/tx.c
View File

@ -908,9 +908,8 @@ ieee80211_tx_h_stats(struct ieee80211_tx_data *tx)
* deal with packet injection down monitor interface * deal with packet injection down monitor interface
* with Radiotap Header -- only called for monitor mode interface * with Radiotap Header -- only called for monitor mode interface
*/ */
static ieee80211_tx_result static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
__ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx, struct sk_buff *skb)
struct sk_buff *skb)
{ {
/* /*
* this is the moment to interpret and discard the radiotap header that * this is the moment to interpret and discard the radiotap header that
@ -961,7 +960,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
* on transmission * on transmission
*/ */
if (skb->len < (iterator.max_length + FCS_LEN)) if (skb->len < (iterator.max_length + FCS_LEN))
return TX_DROP; return false;
skb_trim(skb, skb->len - FCS_LEN); skb_trim(skb, skb->len - FCS_LEN);
} }
@ -983,7 +982,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
} }
if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */ if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */
return TX_DROP; return false;
/* /*
* remove the radiotap header * remove the radiotap header
@ -992,7 +991,7 @@ __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
*/ */
skb_pull(skb, iterator.max_length); skb_pull(skb, iterator.max_length);
return TX_CONTINUE; return true;
} }
/* /*
@ -1026,7 +1025,7 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx,
/* process and remove the injection radiotap header */ /* process and remove the injection radiotap header */
sdata = IEEE80211_DEV_TO_SUB_IF(dev); sdata = IEEE80211_DEV_TO_SUB_IF(dev);
if (unlikely(info->flags & IEEE80211_TX_CTL_INJECTED)) { 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; return TX_DROP;
/* /*