Vlad Yasevich 4b6c7879d8 bridge: Correctly clamp MAX forward_delay when enabling STP ... Commit be4f154d5e bridge: Clamp forward_delay when enabling STP had a typo when attempting to clamp maximum forward delay. It is possible to set bridge_forward_delay to be higher then permitted maximum when STP is off. When turning STP on, the higher then allowed delay has to be clamed down to max value. CC: Herbert Xu <herbert@gondor.apana.org.au> CC: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Reviewed-by: Veaceslav Falico <vfalico@redhat.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-17 16:12:15 -04:00
..
9p	for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window	2013-09-11 12:34:13 -07:00
802	mrp: add periodictimer to allow retries when packets get lost	2013-09-23 16:53:52 -04:00
8021q	net: vlan: fix nlmsg size calculation in vlan_get_size()	2013-10-08 16:32:41 -04:00
appletalk	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
atm	net: always pass struct netdev_notifier_info to netdevice notifiers	2013-05-28 21:58:54 -07:00
ax25	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
batman-adv	batman-adv: set up network coding packet handlers during module init	2013-10-02 13:46:19 +02:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2013-09-27 13:11:17 -04:00
bridge	bridge: Correctly clamp MAX forward_delay when enabling STP	2013-10-17 16:12:15 -04:00
caif	caif: Add missing braces to multiline if in cfctrl_linkup_request	2013-09-05 14:31:02 -04:00
can	can: gw: add a per rule limitation of frame hops	2013-08-29 22:58:24 +02:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-09-19 12:50:37 -05:00
core	net: secure_seq: Fix warning when CONFIG_IPV6 and CONFIG_INET are not selected	2013-10-09 12:59:57 -04:00
dcb	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
dccp	net:dccp: do not report ICMP redirects to user space	2013-09-18 12:33:44 -04:00
decnet	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
dns_resolver	net: strict_strtoul is obsolete, use kstrtoul instead	2013-07-12 16:09:14 -07:00
dsa	net: dsa: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:49 -04:00
ethernet	net: Fix sysfs_format_mac() code duplication.	2013-07-16 17:09:22 -07:00
ieee802154	6lowpan: Sync default hardware address of lowpan links to their wpan	2013-10-08 15:28:37 -04:00
ipv4	tcp: remove the sk_can_gso() check from tcp_set_skb_tso_segs()	2013-10-17 16:08:08 -04:00
ipv6	ipv6: Initialize ip6_tnl.hlen in gre tunnel even if no route is found	2013-10-11 17:50:59 -04:00
ipx	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
irda	net/irda: fixed style issues in irttp	2013-07-19 17:34:40 -07:00
iucv	net: delete __cpuinit usage from all net files	2013-07-14 19:36:58 -04:00
key	xfrm: Guard IPsec anti replay window against replay bitmap	2013-09-17 12:17:10 +02:00
l2tp	l2tp: must disable bh before calling l2tp_xmit_skb()	2013-10-11 16:51:37 -04:00
lapb	net/lapb: re-send packets on timeout	2013-09-23 16:52:45 -04:00
llc	llc: Use normal etherdevice.h tests	2013-09-03 22:34:47 -04:00
mac80211	mac80211: fix crash if bitrate calculation goes wrong	2013-10-14 09:47:08 +02:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
mpls	MPLS: Add limited GSO support	2013-05-27 22:50:59 -07:00
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2013-10-01 12:39:35 -04:00
netlabel	netlabel: use domain based selectors when address based selectors are not available	2013-08-02 16:57:01 -07:00
netlink	net: netlink: filter particular protocols from analyzers	2013-09-06 14:43:48 -04:00
netrom	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
nfc	NFC: Update secure element state	2013-08-14 01:13:40 +02:00
openvswitch	net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs	2013-09-11 16:09:58 -04:00
packet	net: packet: use reciprocal_divide in fanout_demux_hash	2013-08-29 16:43:29 -04:00
phonet	net: proc_fs: trivial: print UIDs as unsigned int	2013-08-15 14:37:46 -07:00
rds	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
rose	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00
rxrpc
sched	netem: free skb's in tree on reset	2013-10-11 17:30:38 -04:00
sctp	sctp: Perform software checksum if packet has to be fragmented.	2013-10-17 15:24:44 -04:00
sunrpc	RPCSEC_GSS: fix crash on destroying gss auth	2013-09-18 10:18:44 -05:00
tipc	tipc: set sk_err correctly when connection fails	2013-08-30 16:06:57 -04:00
unix	unix_diag: fix info leak	2013-10-02 16:08:24 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-16 15:37:26 -07:00
wimax
wireless	wireless: radiotap: fix parsing buffer overrun	2013-10-14 09:47:00 +02:00
x25	x25: add a sanity check parsing X.25 facilities	2013-09-04 00:27:27 -04:00
xfrm	xfrm: check for a vaild skb in xfrm_policy_queue_process	2013-10-08 10:49:51 +02:00
compat.c	net: heap overflow in __audit_sockaddr()	2013-10-03 16:05:14 -04:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Makefile	MPLS: Add limited GSO support	2013-05-27 22:50:59 -07:00
nonet.c
socket.c	net: heap overflow in __audit_sockaddr()	2013-10-03 16:05:14 -04:00
sysctl_net.c	net: Update the sysctl permissions handler to test effective uid/gid	2013-10-07 15:57:56 -04:00