diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /net/tipc/config.c | |
| parent | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (diff) | |
| parent | 6f976267da0e2c873c4b4aaacaf08266d1d1797d (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'net/tipc/config.c')
| -rw-r--r-- | net/tipc/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/config.c b/net/tipc/config.c index c301a9a592d8..e74eef2e7490 100644 --- a/net/tipc/config.c +++ b/net/tipc/config.c | |||
| @@ -181,7 +181,7 @@ static struct sk_buff *cfg_set_own_addr(void) | |||
| 181 | if (tipc_own_addr) | 181 | if (tipc_own_addr) |
| 182 | return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED | 182 | return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED |
| 183 | " (cannot change node address once assigned)"); | 183 | " (cannot change node address once assigned)"); |
| 184 | tipc_core_start_net(addr); | 184 | tipc_net_start(addr); |
| 185 | return tipc_cfg_reply_none(); | 185 | return tipc_cfg_reply_none(); |
| 186 | } | 186 | } |
| 187 | 187 | ||