diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-02-26 11:22:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-26 11:22:03 -0500 |
| commit | 9003019192f045eee8e451916a4bc289c2a3e1be (patch) | |
| tree | 8f323487c0f38547ad0231afdcb1e633994bcd31 /net/unix/af_unix.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff) | |
| parent | rocker: put port in FORWADING state after leaving bridge (diff) | |
| download | wireguard-linux-9003019192f045eee8e451916a4bc289c2a3e1be.tar.xz wireguard-linux-9003019192f045eee8e451916a4bc289c2a3e1be.zip | |
Merge branch 'rocker-next'
Scott Feldman says:
====================
rocker cleanups
Pushing out some rocker cleanups I've had in my queue for a while. Nothing
major, just some sync-up with changes that already went into device code
(hard-coding desc err return values and lport renaming). Also fixup
port fowarding transitions prompted by some DSA discussions about how to
restore port state when port leaves bridge.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions