| Message ID | 1294088938-6219-1-git-send-email-tomas.winkler@intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tomas Winkler <tomas.winkler@intel.com> Date: Mon, 3 Jan 2011 23:08:58 +0200 > net/bridge//br_stp_if.c:148:66: warning: conversion of > net/bridge//br_stp_if.c:148:66: int to > net/bridge//br_stp_if.c:148:66: int enum umh_wait > > net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Applied, thanks Tomas. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 1d88269..79372d4 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -145,7 +145,7 @@ static void br_stp_stop(struct net_bridge *br) char *envp[] = { NULL }; if (br->stp_enabled == BR_USER_STP) { - r = call_usermodehelper(BR_STP_PROG, argv, envp, 1); + r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC); br_info(br, "userspace STP stopped, return code %d\n", r); /* To start timers on any ports left in blocking */ diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index cbc9f39..16df053 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1147,7 +1147,7 @@ ebt_register_table(struct net *net, const struct ebt_table *input_table) void *p; if (input_table == NULL || (repl = input_table->table) == NULL || - repl->entries == 0 || repl->entries_size == 0 || + repl->entries == NULL || repl->entries_size == 0 || repl->counters != NULL || input_table->private != NULL) { BUGPRINT("Bad table data for ebt_register_table!!!\n"); return ERR_PTR(-EINVAL);
net/bridge//br_stp_if.c:148:66: warning: conversion of net/bridge//br_stp_if.c:148:66: int to net/bridge//br_stp_if.c:148:66: int enum umh_wait net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- net/bridge/br_stp_if.c | 2 +- net/bridge/netfilter/ebtables.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)