Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ebc960f authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

6lowpan: iphc: cleanup use of lowpan_fetch_skb 



We introduced the lowpan_fetch_skb function in some previous patches for
6lowpan to have a generic fetch function. This patch drops the old
function and use the generic lowpan_fetch_skb one.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 8ec1d9be

net/6lowpan/iphc.c

+7 −6
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	/* another if the CID flag is set */

	if (iphc1 & LOWPAN_IPHC_CID) {

		pr_debug("CID flag is set, increase header with one\n");

		if (lowpan_fetch_skb_u8(skb, &num_context))

		if (lowpan_fetch_skb(skb, &num_context, sizeof(num_context)))

			goto drop;

	}
@@ -370,7 +370,7 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	 * ECN + DSCP + 4-bit Pad + Flow Label (4 bytes)

	 */

	case 0: /* 00b */

		if (lowpan_fetch_skb_u8(skb, &tmp))

		if (lowpan_fetch_skb(skb, &tmp, sizeof(tmp)))

			goto drop;



		memcpy(&hdr.flow_lbl, &skb->data[0], 3);
@@ -384,7 +384,7 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	 * ECN + DSCP (1 byte), Flow Label is elided

	 */

	case 2: /* 10b */

		if (lowpan_fetch_skb_u8(skb, &tmp))

		if (lowpan_fetch_skb(skb, &tmp, sizeof(tmp)))

			goto drop;



		hdr.priority = ((tmp >> 2) & 0x0f);
@@ -395,7 +395,7 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	 * ECN + 2-bit Pad + Flow Label (3 bytes), DSCP is elided

	 */

	case 1: /* 01b */

		if (lowpan_fetch_skb_u8(skb, &tmp))

		if (lowpan_fetch_skb(skb, &tmp, sizeof(tmp)))

			goto drop;



		hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
@@ -412,7 +412,7 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	/* Next Header */

	if ((iphc0 & LOWPAN_IPHC_NH_C) == 0) {

		/* Next header is carried inline */

		if (lowpan_fetch_skb_u8(skb, &(hdr.nexthdr)))

		if (lowpan_fetch_skb(skb, &hdr.nexthdr, sizeof(hdr.nexthdr)))

			goto drop;



		pr_debug("NH flag is set, next header carried inline: %02x\n",
@@ -423,7 +423,8 @@ int lowpan_process_data(struct sk_buff *skb, struct net_device *dev, 
	if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)

		hdr.hop_limit = lowpan_ttl_values[iphc0 & 0x03];

	else {

		if (lowpan_fetch_skb_u8(skb, &(hdr.hop_limit)))

		if (lowpan_fetch_skb(skb, &hdr.hop_limit,

				     sizeof(hdr.hop_limit)))

			goto drop;

	}