Re: [PATCH bluetooth-next 2/3] ieee802154: add ieee802154_skb_src_pan helper

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On 06/17/2016 06:34 PM, Alexander Aring wrote:
> This patch adds ieee802154_skb_src_pan function to get the pointer
> address of the source pan id at skb mac pointer.
> 
> Signed-off-by: Alexander Aring <aar@xxxxxxxxxxxxxx>
> ---
>  include/linux/ieee802154.h | 12 ++++++++++++
>  include/net/mac802154.h    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 58 insertions(+)
> 
> diff --git a/include/linux/ieee802154.h b/include/linux/ieee802154.h
> index 91f4665..fd14815 100644
> --- a/include/linux/ieee802154.h
> +++ b/include/linux/ieee802154.h
> @@ -224,12 +224,15 @@ enum {
>  #define IEEE802154_FCTL_SECEN		0x0004
>  #define IEEE802154_FCTL_INTRA_PAN	0x0040
>  #define IEEE802154_FCTL_DADDR		0x0c00
> +#define IEEE802154_FCTL_SADDR		0xc000
>  
>  #define IEEE802154_FTYPE_DATA		0x0001
>  
>  #define IEEE802154_FCTL_ADDR_NONE	0x0000
>  #define IEEE802154_FCTL_DADDR_SHORT	0x0800
>  #define IEEE802154_FCTL_DADDR_EXTENDED	0x0c00
> +#define IEEE802154_FCTL_SADDR_SHORT	0x8000
> +#define IEEE802154_FCTL_SADDR_EXTENDED	0xc000
>  
>  /*
>   * ieee802154_is_data - check if type is IEEE802154_FTYPE_DATA
> @@ -277,6 +280,15 @@ static inline __le16 ieee802154_daddr_mode(__le16 fc)
>  	return fc & cpu_to_le16(IEEE802154_FCTL_DADDR);
>  }
>  
> +/*
> + * ieee802154_saddr_mode - get saddr mode from fc
> + * @fc: frame control bytes in little-endian byteorder
> + */
> +static inline __le16 ieee802154_saddr_mode(__le16 fc)
> +{
> +	return fc & cpu_to_le16(IEEE802154_FCTL_SADDR);
> +}
> +
>  /**
>   * ieee802154_is_valid_psdu_len - check if psdu len is valid
>   * available lengths:
> diff --git a/include/net/mac802154.h b/include/net/mac802154.h
> index b3f7cd8..deb90a1 100644
> --- a/include/net/mac802154.h
> +++ b/include/net/mac802154.h
> @@ -287,6 +287,52 @@ static inline unsigned char *ieee802154_skb_dst_pan(__le16 fc,
>  }
>  
>  /**
> + * ieee802154_skb_src_pan - get the pointer to source pan field
> + * @fc: mac header frame control field
> + * @skb: skb where the source pan pointer will be get from
> + */
> +static inline unsigned char *ieee802154_skb_src_pan(__le16 fc,
> +						    const struct sk_buff *skb)
> +{
> +	unsigned char *src_pan;
> +
> +	switch (ieee802154_saddr_mode(fc)) {
> +	case cpu_to_le16(IEEE802154_FCTL_ADDR_NONE):
> +		src_pan = NULL;
> +		break;
> +	case cpu_to_le16(IEEE802154_FCTL_SADDR_SHORT):
> +	case cpu_to_le16(IEEE802154_FCTL_SADDR_EXTENDED):
> +		src_pan = skb_mac_header(skb) +
> +			  IEEE802154_FC_LEN +
> +			  IEEE802154_SEQ_LEN;
> +
> +		switch (ieee802154_daddr_mode(fc)) {
> +		case cpu_to_le16(IEEE802154_FCTL_ADDR_NONE):
> +			break;
> +		case cpu_to_le16(IEEE802154_FCTL_DADDR_SHORT):

src_pan += IEEE802154_PAN_ID_LEN;

is missing for, because daddr is non NONE we need to add destination
pan_id length.

> +			if (!ieee802154_is_intra_pan(fc))
> +				src_pan += IEEE802154_SHORT_ADDR_LEN;
> +			break;
> +		case cpu_to_le16(IEEE802154_FCTL_DADDR_EXTENDED):

same here.

I will send a v2.

- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux