On Tue, 2007-03-20 at 10:39 +0000, andy@xxxxxxxxxxx wrote:
I don't really see why this is necessary at all, but anyway.
> - (tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {
> + (tx->fc & IEEE80211_FCTL_FTYPE)
> +== IEEE80211_FTYPE_DATA)) {
That's totally borked.
> - if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
> + if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) ==
> + IEEE80211_FTYPE_DATA &&
Indent that a bit more so it's clear it belongs to the line above and
isn't a condition itself.
> if (unlikely(!sta ||
> ((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT &&
> - (tx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)))
> + (tx->fc & IEEE80211_FCTL_STYPE) ==
> + IEEE80211_STYPE_PROBE_RESP)))
ditto.
> @@ -1170,7 +1178,8 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
> IEEE80211_TXCTL_RATE_CTRL_PROBE;
> else
> control->flags &=
> - ~IEEE80211_TXCTL_RATE_CTRL_PROBE;
> + ~IEEE80211_TXCTL_RATE_CTRL_PROBE
> + ;
ahem.
> - printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
> + printk(KERN_DEBUG
> + "%s: ieee80211_beacon_get: no rate "
> "found\n", local->mdev->name);
Please change that to
... no "
"rate found\n", ...
instead.
> __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
> size_t frame_len,
> - const struct ieee80211_tx_control *frame_txctl)
> + const struct ieee80211_tx_control
> + *frame_txctl)
That's not how the kernel looks like in that case. I'd prefer this as
__le16 ieee80211_ctstoself_duration(
struct ieee80211_hw *hw,
size_t frame_len,
const struct ieee80211_tx_control *frame_txctl)
> if (rx->sdata->bss)
> - bss_tim_clear(rx->local, rx->sdata->bss, rx->sta->aid);
> + bss_tim_clear(rx->local, rx->sdata->bss,
> + rx->sta->aid);
You have lots of space to indent it to the parenthesis.
> - if ((fc & IEEE80211_FCTL_FTYPE) != (f_fc & IEEE80211_FCTL_FTYPE) ||
> + if ((fc & IEEE80211_FCTL_FTYPE) !=
> + (f_fc & IEEE80211_FCTL_FTYPE) ||
same as above.
> - (rx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)) &&
> + (rx->fc & IEEE80211_FCTL_STYPE) ==
> + IEEE80211_STYPE_PSPOLL)) &&
ditto.
> (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
> - (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
> + (rx->fc & IEEE80211_FCTL_STYPE) !=
> + IEEE80211_STYPE_NULLFUNC &&
ditto.
> - (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
> + (rx->fc & IEEE80211_FCTL_STYPE) !=
> + IEEE80211_STYPE_NULLFUNC &&
ditto.
> @@ -3800,8 +3820,9 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb,
> continue;
> rx.u.rx.ra_match = 0;
> } else if (!multicast &&
> - compare_ether_addr(sdata->dev->dev_addr,
> - hdr->addr1) != 0) {
> + compare_ether_addr(
> + sdata->dev->dev_addr,
> + hdr->addr1) != 0) {
> if (!sdata->promisc)
> continue;
Ugh. Somebody really needs to take this code and delete some indent by
moving stuff into new functions.
> if (net_ratelimit())
> - printk(KERN_DEBUG "%s: failed to copy "
> + printk(KERN_DEBUG
> + "%s: failed to copy "
> "multicast frame for %s",
> - local->mdev->name, prev->dev->name);
> + local->mdev->name,
> + prev->dev->name);
Same as I said for that other message.
johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
