summaryrefslogtreecommitdiff
path: root/die.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-06-13 16:47:13 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-06-13 16:47:13 +0200
commit0cc5ca825656dbb2dc91fb130924abe66c97b254 (patch)
tree6f815e726eb0f543115823c7940c1e325fbe195d /die.h
parentbdf2285959f985bb1d9a92ba22eefadc6d85a393 (diff)
dissector: eth: Free allocated record if line is skipped
We would currently leak the record in case we skip a line, fix this by xfree()ing the memory in these cases. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'die.h')
0 files changed, 0 insertions, 0 deletions
d98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/addr.h')