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

Commit febf0a43 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[NETFILTER] bug: skb->protocol is already net-endian 



htons() is not needed (and no, it's not misspelled ntohs() -
userland expects net-endian here).

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1208b99

net/netfilter/nfnetlink_log.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ __build_packet_message(struct nfulnl_instance *inst, 
	nfmsg->version = NFNETLINK_V0;

	nfmsg->res_id = htons(inst->group_num);



	pmsg.hw_protocol	= htons(skb->protocol);

	pmsg.hw_protocol	= skb->protocol;

	pmsg.hook		= hooknum;



	NFA_PUT(inst->skb, NFULA_PACKET_HDR, sizeof(pmsg), &pmsg);

net/netfilter/nfnetlink_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue, 
	nfmsg->res_id = htons(queue->queue_num);



	pmsg.packet_id 		= htonl(entry->id);

	pmsg.hw_protocol	= htons(entskb->protocol);

	pmsg.hw_protocol	= entskb->protocol;

	pmsg.hook		= entinf->hook;



	NFA_PUT(skb, NFQA_PACKET_HDR, sizeof(pmsg), &pmsg);