Commit 2e2173df authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: eth1394: clean up fragment_overlap 



offset > fi->offset + fi->len - 1  ==  !(offset < fi->offset + fi->len)
offset + len - 1 < fi->offset      ==  !(offset + len > fi->offset)
!(A || B)  ==  (!A && !B)

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 01590d20

drivers/ieee1394/eth1394.c

+4 −4
Original line number Diff line number Diff line
@@ -867,12 +867,12 @@ static u16 ether1394_parse_encap(struct sk_buff *skb, struct net_device *dev, 
static int fragment_overlap(struct list_head *frag_list, int offset, int len)

{

	struct fragment_info *fi;

	int end = offset + len;



	list_for_each_entry(fi, frag_list, list) {

		if ( ! ((offset > (fi->offset + fi->len - 1)) ||

		       ((offset + len - 1) < fi->offset)))

	list_for_each_entry(fi, frag_list, list)

		if (offset < fi->offset + fi->len && end > fi->offset)

			return 1;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE