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

Commit ef2c4556 authored by Moon Yeounsu's avatar Moon Yeounsu Committed by Greg Kroah-Hartman
Browse files

net: ethernet: use ip_hdrlen() instead of bit shift 



[ Upstream commit 9a039eeb71a42c8b13408a1976e300f3898e1be0 ]

`ip_hdr(skb)->ihl << 2` is the same as `ip_hdrlen(skb)`
Therefore, we should use a well-defined function not a bit shift
to find the header length.

It also compresses two lines to a single line.

Signed-off-by: default avatarMoon Yeounsu <yyyynoom@gmail.com>
Reviewed-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 11f5645c

drivers/net/ethernet/jme.c

+4 −6
Original line number Diff line number Diff line
@@ -947,15 +947,13 @@ jme_udpsum(struct sk_buff *skb) 
	if (skb->protocol != htons(ETH_P_IP))

		return csum;

	skb_set_network_header(skb, ETH_HLEN);

	if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||

	    (skb->len < (ETH_HLEN +

			(ip_hdr(skb)->ihl << 2) +

			sizeof(struct udphdr)))) {



	if (ip_hdr(skb)->protocol != IPPROTO_UDP ||

	    skb->len < (ETH_HLEN + ip_hdrlen(skb) + sizeof(struct udphdr))) {

		skb_reset_network_header(skb);

		return csum;

	}

	skb_set_transport_header(skb,

			ETH_HLEN + (ip_hdr(skb)->ihl << 2));

	skb_set_transport_header(skb, ETH_HLEN + ip_hdrlen(skb));

	csum = udp_hdr(skb)->check;

	skb_reset_transport_header(skb);

	skb_reset_network_header(skb);