diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-23 14:12:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-23 14:12:08 -0400 |
| commit | f9474ddfaa009ead12bba44fa8fd49dc4536a124 (patch) | |
| tree | a1738a74ac909d84cc80af674d7c0b78af10a413 /net/tipc/socket.c | |
| parent | 989e04c5bc3ff77d65e1f0d87bf7904dfa30d41c (diff) | |
| parent | a45e92a599e77ee6a850eabdd0141633fde03915 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pulling to get some TIPC fixes that a net-next series depends
upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7d423ee10897..ff8c8118d56e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -1973,7 +1973,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt, | |||
| 1973 | 1973 | ||
| 1974 | switch (opt) { | 1974 | switch (opt) { |
| 1975 | case TIPC_IMPORTANCE: | 1975 | case TIPC_IMPORTANCE: |
| 1976 | tipc_port_set_importance(port, value); | 1976 | res = tipc_port_set_importance(port, value); |
| 1977 | break; | 1977 | break; |
| 1978 | case TIPC_SRC_DROPPABLE: | 1978 | case TIPC_SRC_DROPPABLE: |
| 1979 | if (sock->type != SOCK_STREAM) | 1979 | if (sock->type != SOCK_STREAM) |