diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2017-08-24 15:30:32 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-08-24 15:30:32 -0700 |
| commit | f4745880289463b498350c72842d0029e8345b28 (patch) | |
| tree | ad23e53c264e617e93ff4ada8a3220702db641ab /tipc | |
| parent | 9a1381d50913d59aa3ba1ccb12dc3a0bbd64573b (diff) | |
| parent | c4fc474b889aa17ada813018aae6b20030e9c58e (diff) | |
Merge branch 'master' into net-next
Diffstat (limited to 'tipc')
| -rw-r--r-- | tipc/bearer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tipc/bearer.c b/tipc/bearer.c index c3d4491f..0d845701 100644 --- a/tipc/bearer.c +++ b/tipc/bearer.c @@ -439,7 +439,7 @@ static int cmd_bearer_enable(struct nlmsghdr *nlh, const struct cmd *cmd, return err; opt = get_opt(opts, "media"); - if (strcmp(opt->val, "udp") == 0) { + if (opt && strcmp(opt->val, "udp") == 0) { err = nl_add_udp_enable_opts(nlh, opts, cmdl); if (err) return err; |