Xin Long 6d18c732b9 bridge: start hello_timer when enabling KERNEL_STP in br_stp_start ... Since commit 76b91c32dd ("bridge: stp: when using userspace stp stop kernel hello and hold timers"), bridge would not start hello_timer if stp_enabled is not KERNEL_STP when br_dev_open. The problem is even if users set stp_enabled with KERNEL_STP later, the timer will still not be started. It causes that KERNEL_STP can not really work. Users have to re-ifup the bridge to avoid this. This patch is to fix it by starting br->hello_timer when enabling KERNEL_STP in br_stp_start. As an improvement, it's also to start hello_timer again only when br->stp_enabled is KERNEL_STP in br_hello_timer_expired, there is no reason to start the timer again when it's NO_STP. Fixes: 76b91c32dd ("bridge: stp: when using userspace stp stop kernel hello and hold timers") Reported-by: Haidong Li <haili@redhat.com> Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Reviewed-by: Ivan Vecera <cera@cera.cz> Signed-off-by: David S. Miller <davem@davemloft.net>		2017-05-21 13:33:28 -04:00
..
6lowpan	6lowpan: Don't set IFF_NO_QUEUE	2017-04-12 22:02:40 +02:00
9p	xen: fixes and featrues for 4.12	2017-05-04 11:37:09 -07:00
802	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
8021q	vlan: Keep NETIF_F_HW_CSUM similar to other software devices	2017-05-08 14:39:19 -04:00
appletalk	lib/vsprintf.c: remove %Z support	2017-02-27 18:43:47 -08:00
atm	neighbour: fix nlmsg_pid in notifications	2017-03-22 10:48:49 -07:00
ax25	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
batman-adv	This feature/cleanup patchset includes the following patches:	2017-04-06 14:37:50 -07:00
bluetooth	Bluetooth: Add selftest for ECDH key generation	2017-04-30 16:52:43 +03:00
bpf	bpf: Align packet data properly in program testing framework.	2017-05-02 11:46:28 -04:00
bridge	bridge: start hello_timer when enabling KERNEL_STP in br_stp_start	2017-05-21 13:33:28 -04:00
caif	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>	2017-03-02 08:42:29 +01:00
can	can: fix CAN BCM build with CONFIG_PROC_FS disabled	2017-04-27 09:34:13 +02:00
ceph	The two main items are support for disabling automatic rbd exclusive	2017-05-10 08:42:33 -07:00
core	net: fix compile error in skb_orphan_partial()	2017-05-17 15:10:13 -04:00
dcb	net: rtnetlink: plumb extended ack to doit function	2017-04-17 15:35:38 -04:00
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-15 15:50:49 -07:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-09 15:42:31 -07:00
dns_resolver	Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-03-03 10:16:38 -08:00
dsa	net: dsa: Remove redundant NULL dst check	2017-04-21 10:41:24 -04:00
ethernet	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
hsr	netlink: extended ACK reporting	2017-04-13 13:58:20 -04:00
ieee802154	netlink: pass extended ACK struct where available	2017-04-13 13:58:22 -04:00
ife	net: Introduce ife encapsulation module	2017-02-03 15:16:45 -05:00
ipv4	arp: always override existing neigh entries with gratuitous ARP	2017-05-21 13:26:45 -04:00
ipv6	udp: make *udp*_queue_rcv_skb() functions static	2017-05-18 10:23:33 -04:00
ipx	ipx: call ipxitf_put() in ioctl error path	2017-05-02 15:34:53 -04:00
irda	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
iucv	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
kcm	kcm: remove a useless copy_from_user()	2017-04-17 13:28:48 -04:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
l2tp	l2tp: remove useless device duplication test in l2tp_eth_create()	2017-04-27 16:32:13 -04:00
l3mdev
lapb	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
llc	Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu	2017-04-23 11:12:44 +02:00
mac80211	mac80211: fix IBSS presp allocation size	2017-05-08 11:25:04 +02:00
mac802154	drivers: add explicit interrupt.h includes	2017-03-30 11:05:34 -07:00
mpls	treewide: use kv[mz]alloc* rather than opencoded variants	2017-05-08 17:15:13 -07:00
ncsi
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2017-05-21 13:00:02 -04:00
netlabel	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
netlink	netlink: pass extended ACK struct where available	2017-04-13 13:58:22 -04:00
netrom	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
nfc	NFC 4.12 pull request	2017-04-21 15:29:40 -04:00
openvswitch	netfilter: introduce nf_conntrack_helper_put helper function	2017-05-15 12:42:29 +02:00
packet	net/packet: fix missing net_device reference release	2017-05-15 14:22:12 -04:00
phonet	net: rtnetlink: plumb extended ack to doit function	2017-04-17 15:35:38 -04:00
psample	net: Introduce psample, a new genetlink channel for packet sampling	2017-01-24 13:44:28 -05:00
qrtr	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-05-02 16:40:27 -07:00
rfkill	rfkill: remove rfkill-regulator	2017-01-24 11:07:35 +01:00
rose	net: Work around lockdep limitation in sockets that use sockets	2017-03-09 18:23:27 -08:00
rxrpc	rxrpc: Trace client call connection	2017-04-06 11:10:41 +01:00
sched	net: sched: optimize class dumps	2017-05-11 21:37:40 -04:00
sctp	sctp: do not inherit ipv6_{mc|ac|fl}_list from parent	2017-05-18 10:24:08 -04:00
smc	net/smc: Add warning about remote memory exposure	2017-05-16 14:49:43 -04:00
strparser	strparser: destroy workqueue on module exit	2017-03-03 20:43:26 -08:00
sunrpc	Another RDMA update from Chuck Lever, and a bunch of miscellaneous	2017-05-10 13:29:23 -07:00
switchdev	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
tipc	tipc: make macro tipc_wait_for_cond() smp safe	2017-05-11 22:19:30 -04:00
unix	af_unix: Use designated initializers	2017-04-06 12:43:04 -07:00
vmw_vsock	virtio: fixes, cleanups, performance	2017-05-10 11:33:08 -07:00
wimax
wireless	nl80211: correctly validate MU-MIMO groups	2017-05-08 11:24:34 +02:00
x25	net: x25: fix one potential use-after-free issue	2017-05-18 10:05:40 -04:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-05-02 16:40:27 -07:00
compat.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-02-22 10:15:09 -08:00
Kconfig	bpf: make jited programs visible in traces	2017-02-17 13:40:05 -05:00
Makefile	bpf: introduce BPF_PROG_TEST_RUN command	2017-04-01 12:45:57 -07:00
socket.c	l2tp: device MTU setup, tunnel socket needs a lock	2017-04-17 13:01:48 -04:00
sysctl_net.c	sysctl: Remove dead register_sysctl_root	2017-04-16 23:42:49 -05:00