mausezahn-libs =	-lcli \
			-lnet \
			-lpcap \
			-lrt \
			-lpthread \
			-lm

mausezahn-objs =	str.o \
			staging/layer1.o \
			staging/layer2.o \
			staging/layer3.o \
			staging/layer4.o \
			staging/hextools.o \
			staging/tools.o \
			staging/lookupdev.o \
			staging/time.o \
			staging/modifications.o \
			staging/send_eth.o \
			staging/send.o \
			staging/cdp.o \
			staging/rtp.o \
			staging/dns.o \
			staging/rcv_rtp.o \
			staging/syslog.o \
			staging/cli.o \
			staging/cli_cmds.o \
			staging/cli_launch.o \
			staging/cli_legacy.o \
			staging/cli_packet.o \
			staging/cli_interface.o \
			staging/cli_set.o \
			staging/cli_dns.o \
			staging/cli_arp.o \
			staging/cli_bpdu.o \
			staging/cli_eth.o \
			staging/cli_ip.o \
			staging/cli_udp.o \
			staging/cli_tcp.o \
			staging/cli_rtp.o \
			staging/cli_tools.o \
			staging/cli_igmp.o \
			staging/cli_lldp.o \
			staging/cli_sequence.o \
			staging/mops.o \
			staging/mops_update.o \
			staging/mops_tools.o \
			staging/mops_checksums.o \
			staging/mops_threads.o \
			staging/mops_dot1Q.o \
			staging/mops_mpls.o \
			staging/mops_ip.o \
			staging/mops_tcp.o \
			staging/mops_ext.o \
			staging/mops_ext_arp.o \
			staging/mops_ext_bpdu.o \
			staging/mops_ext_rtp.o \
			staging/mopsrx_arp.o \
			staging/mops_ext_igmp.o \
			staging/mops_ext_lldp.o \
			staging/mops_sequence.o \
			staging/automops.o \
			staging/parse_xml.o \
			staging/tx_switch.o \
			staging/llist.o \
			staging/directmops.o \
			staging/mausezahn.o

mausezahn-eflags = -O2 -I. -I.. \
		   -DVERSION_STRING=\"$(VERSION_STRING)\" \
		   -DPREFIX_STRING=\"$(PREFIX)\" \
		   -DVERSION_LONG=\"$(VERSION_LONG)\"
nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/?h=nds-private-remove'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='be8aa3380678183821bd7d7b5dec845f10d776ce'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='be8aa3380678183821bd7d7b5dec845f10d776ce'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David Howells &lt;dhowells@redhat.com&gt;</td><td class='right'>2016-09-23 12:39:23 +0100</td></tr>
<tr><th>committer</th><td>David Howells &lt;dhowells@redhat.com&gt;</td><td class='right'>2016-09-23 15:35:45 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>be8aa3380678183821bd7d7b5dec845f10d776ce</a> (<a href='/cgit.cgi/linux/net-next.git/patch/?id=be8aa3380678183821bd7d7b5dec845f10d776ce'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>14e483a5c1e80d0259c8b1467183a61dce362ee4</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=dfc3da4404ad1ec42a0a649a4ffa2b0f37e80352'>dfc3da4404ad1ec42a0a649a4ffa2b0f37e80352</a> (<a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce&amp;id2=dfc3da4404ad1ec42a0a649a4ffa2b0f37e80352'>diff</a>)</td></tr></table>
<div class='commit-subject'>rxrpc: Fix accidental cancellation of scheduled resend by ACK parser</div><div class='commit-msg'>When rxrpc_input_soft_acks() is parsing the soft-ACKs from an ACK packet,
it updates the Tx packet annotations in the annotation buffer.  If a
soft-ACK is an ACK, then we overwrite unack'd, nak'd or to-be-retransmitted
states and that is fine; but if the soft-ACK is an NACK, we overwrite the
to-be-retransmitted with a nak - which isn't.

Instead, we need to let any scheduled retransmission stand if the packet
was NAK'd.

Note that we don't reissue a resend if the annotation is in the
to-be-retransmitted state because someone else must've scheduled the
resend already.

Signed-off-by: David Howells &lt;dhowells@redhat.com&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=be8aa3380678183821bd7d7b5dec845f10d776ce'>Diffstat</a></div><table summary='diffstat' class='diffstat'>