Merge branch 'tipc-next'

Browse source

Jon Maloy says:

====================
tipc: some small fixes

When fix a minor buffer leak, and ensure that bearers filter packets
correctly while they are being shut down.

v2: Corrected typos in commit #3, as per feedback from S. Shtylyov
v3: Removed commit #3 from the series. Improved version will be
    re-submitted later.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2016-04-07 17:00:14 -04:00

parent ba35855e24 5b7066c3dd

commit 889750bd2e

4 changed files with 67 additions and 48 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

101

net/tipc/bearer.c

View file

7

net/tipc/discover.c

View file

2

net/tipc/discover.h

View file

5

net/tipc/msg.h

View file