V4L/DVB (7960): net: endianness annotations (12fbcef1) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/dvb/dvb-core/dvb_net.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,7 @@ struct dvb_net_priv {
	* stolen from eth.c out of the linux kernel, hacked for dvb-device		* stolen from eth.c out of the linux kernel, hacked for dvb-device
	* by Michael Holzt <kju@debian.org>		* by Michael Holzt <kju@debian.org>
	*/		*/
	static unsigned short dvb_net_eth_type_trans(struct sk_buff *skb,		static __be16 dvb_net_eth_type_trans(struct sk_buff *skb,
	struct net_device *dev)		struct net_device *dev)
	{		{
	struct ethhdr *eth;		struct ethhdr *eth;
	@@ -277,10 +277,10 @@ static int handle_one_ule_extension( struct dvb_net_priv *p )
	if(ext_len >= 0) {		if(ext_len >= 0) {
	p->ule_next_hdr += ext_len;		p->ule_next_hdr += ext_len;
	if (!p->ule_bridged) {		if (!p->ule_bridged) {
	p->ule_sndu_type = ntohs((unsigned short )p->ule_next_hdr);		p->ule_sndu_type = ntohs((__be16 )p->ule_next_hdr);
	p->ule_next_hdr += 2;		p->ule_next_hdr += 2;
	} else {		} else {
	p->ule_sndu_type = ntohs((unsigned short )(p->ule_next_hdr + ((p->ule_dbit ? 2 : 3) * ETH_ALEN)));		p->ule_sndu_type = ntohs((__be16 )(p->ule_next_hdr + ((p->ule_dbit ? 2 : 3) * ETH_ALEN)));
	/* This assures the extension handling loop will terminate. */		/* This assures the extension handling loop will terminate. */
	}		}
	}		}
	@@ -294,7 +294,7 @@ static int handle_one_ule_extension( struct dvb_net_priv *p )
	if (ule_optional_ext_handlers[htype])		if (ule_optional_ext_handlers[htype])
	(void)ule_optional_ext_handlers[htype]( p );		(void)ule_optional_ext_handlers[htype]( p );
	p->ule_next_hdr += ext_len;		p->ule_next_hdr += ext_len;
	p->ule_sndu_type = ntohs( (unsigned short )(p->ule_next_hdr-2) );		p->ule_sndu_type = ntohs( (__be16 )(p->ule_next_hdr-2) );
	/*		/*
	* note: the length of the next header type is included in the		* note: the length of the next header type is included in the
	* length of THIS optional extension header		* length of THIS optional extension header
	@@ -594,8 +594,8 @@ static void dvb_net_ule( struct net_device dev, const u8 buf, size_t buf_len )
	/* Check for complete payload. */		/* Check for complete payload. */
	if (priv->ule_sndu_remain <= 0) {		if (priv->ule_sndu_remain <= 0) {
	/* Check CRC32, we've got it in our skb already. */		/* Check CRC32, we've got it in our skb already. */
	unsigned short ulen = htons(priv->ule_sndu_len);		__be16 ulen = htons(priv->ule_sndu_len);
	unsigned short utype = htons(priv->ule_sndu_type);		__be16 utype = htons(priv->ule_sndu_type);
	const u8 *tail;		const u8 *tail;
	struct kvec iov[3] = {		struct kvec iov[3] = {
	{ &ulen, sizeof ulen },		{ &ulen, sizeof ulen },