diff options
| author | Dave Airlie | 2018-03-28 06:30:41 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-03-28 06:30:41 +0200 |
| commit | 2b4f44eec2be2688511c2b617d0e1b4f94c45ba4 (patch) | |
| tree | 533c03602f4ae6d6404db6fa56c88e6f83e1bebe /drivers/net/team/team.c | |
| parent | Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | Linux 4.16-rc7 (diff) | |
| download | kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.gz kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.xz kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.zip | |
Backmerge tag 'v4.16-rc7' into drm-next
Linux 4.16-rc7
This was requested by Daniel, and things were getting
a bit hard to reconcile, most of the conflicts were
trivial though.
Diffstat (limited to 'drivers/net/team/team.c')
| -rw-r--r-- | drivers/net/team/team.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index a468439969df..56c701b73c12 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2395,7 +2395,7 @@ send_done: if (!nlh) { err = __send_and_alloc_skb(&skb, team, portid, send_func); if (err) - goto errout; + return err; goto send_done; } @@ -2681,7 +2681,7 @@ send_done: if (!nlh) { err = __send_and_alloc_skb(&skb, team, portid, send_func); if (err) - goto errout; + return err; goto send_done; } |