Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a9180a2 authored by Tomas Winkler's avatar Tomas Winkler Committed by David S. Miller
Browse files

net/bridge: fix trivial sparse errors 



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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebd80880

net/bridge/br_stp_if.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -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);