Hi Christian,
On Sun, Oct 21, 2012 at 5:00 AM, Christian Lamparter
<chunkeey@xxxxxxxxxxxxxx> wrote:
> diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
> index 9cd93f1..887a4ae 100644
> --- a/drivers/net/wireless/ath/carl9170/rx.c
> +++ b/drivers/net/wireless/ath/carl9170/rx.c
> @@ -660,6 +660,38 @@ static bool carl9170_ampdu_check(struct ar9170 *ar, u8 *buf, u8 ms,
> return false;
> }
>
> +static int carl9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len,
> + struct ieee80211_rx_status *status)
> +{
> + struct sk_buff *skb;
> + int err = 0;
Personally, I hate the style of error handling where you have an
explicit variable for a return value
> +
> + /* (driver) frame trap handler
> + *
> + * Because power-saving mode handing has to be implemented by
> + * the driver/firmware. We have to check each incoming beacon
> + * from the associated AP, if there's new data for us (either
> + * broadcast/multicast or unicast) we have to react quickly.
> + *
> + * So, if you have you want to add additional frame trap
> + * handlers, this would be the perfect place!
> + */
> +
> + carl9170_ps_beacon(ar, buf, len);
> +
> + carl9170_ba_check(ar, buf, len);
> +
> + skb = carl9170_rx_copy_data(buf, len);
> + if (skb) {
> + memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
> + ieee80211_rx(ar->hw, skb);
> + } else {
> + err = -ENOMEM;
and then only set it
> + }
> +
> + return err;
immediately before you return it.
> +}
> +
That said, this is my personal preference on the matter - however that
style does make the "err" variable somewhat unnecessary as it's only
used once. (yes, gcc will optimise it away, but that's not the point)
If you eliminated it, everything from if (skb) { on could be replaced by:
if (!skb)
return -ENOMEM;
memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
ieee80211_rx(ar->hw, skb);
return 0;
}
which, IMHO, is much cleaner.
Thanks,
--
Julian Calaby
Email: julian.calaby@xxxxxxxxx
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
