Re: [PATCH 7/6] p54: integrate parts of lmac_longbow.h and other parts of stlc45xx

[Harvey Harrison <harvey.harrison@gmail.com>]

On Thu, 2008-10-16 at 23:20 +0200, Christian Lamparter wrote:
> On Thursday 16 October 2008 17:46:18 Larry Finger wrote:
> > The following change of ack_rssi from __le16 to u8 generates the sparse warning
> > "drivers/net/wireless/p54/p54common.c:660:5: warning: cast to restricted __le16":
> > 

> @@ -739,9 +777,9 @@ static int p54_rx_control(struct ieee802
>  /* returns zero if skb can be reused */
>  int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb)
>  {
> -	u8 type = le16_to_cpu(*((__le16 *)skb->data)) >> 8;
> +	u16 type = le16_to_cpu(*((__le16 *)skb->data));

	u16 type = le16_to_cpup((__le16 *)skb->data);

> +
> +#ifndef WLAN_FC_GET_TYPE
> +#define WLAN_FC_GET_TYPE(fc) (fc & IEEE80211_FCTL_FTYPE)
> +#define WLAN_FC_GET_STYPE(fc) (fc & IEEE80211_FCTL_STYPE)
> +#endif
> +

Suggest you look into some of the helpers in ieee80211.h

> +
> +static int p54_tx_fill(struct ieee80211_hw *dev, struct sk_buff *skb,
> +		struct ieee80211_tx_info* info, u8 *queue, size_t *extra_len,
> +		u16 *flags, u16 *aid)
> +{
> +	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
> +	struct p54_common *priv = dev->priv;
> +	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;

> +	int ret = 0;
> +
> +	if (unlikely(WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_MGMT)) {

	ieee80211_is_mgmt(fc);

> +		switch (WLAN_FC_GET_STYPE(fc)) {

Not sure what the prevailing wisdom is here, switch to if /else if using
the helpers ieee80211_is_beacon(fc), ieee80211_is_probe_resp to do
compile-time byteswaps.

or
		switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)
		case cpu_to_le16(IEEE80211_STYPE_BEACON):

etc.

> +		case IEEE80211_STYPE_BEACON:
> +			*aid = 0;
> +			*queue = 0;
> +			*extra_len = IEEE80211_MAX_TIM_LEN;
> +			*flags = P54_HDR_FLAG_DATA_OUT_TIMESTAMP;
> +			return 0;
> +		case IEEE80211_STYPE_PROBE_RESP:
> +			*aid = 0;
> +			*queue = 2;
> +			*flags = P54_HDR_FLAG_DATA_OUT_TIMESTAMP |
> +				 P54_HDR_FLAG_DATA_OUT_NOCANCEL;
> +			return 0;
> +		default:
> +			*queue = 2;
> +			ret = 0;

		return?

Cheers,

Harvey