BMC/Intel-BMC/linux.git/net/hsr/hsr_framereg.c, branch dev

net/hsr: Remove left-over never-true conditional code.

2014-07-11T22:04:40+00:00

MacAddressB is an array (unsigned char MacAddressB[ETH_ALEN]) and is allocated as a part of *node_dst (which is a struct hsr_node). So the condition is always false. Detected by Dan Carpenter. Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

net/hsr: Better frame dispatch

2014-07-08T18:35:31+00:00

This patch removes the separate paths for frames coming from the outside, and frames sent from the HSR device, and instead makes all frames go through hsr_forward_skb() in hsr_forward.c. This greatly improves code readability and also opens up the possibility for future support of the HSR Interlink device that is the basis for HSR RedBoxes and HSR QuadBoxes, as well as VLAN compatibility. Other improvements: * A reduction in the number of times an skb is copied on machines without HAVE_EFFICIENT_UNALIGNED_ACCESS, which improves throughput somewhat. * Headers are now created using the standard eth_header(), and using the standard hard_header_len. * Each HSR slave now gets its own private skb, so slave-specific fields can be correctly set. Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

net/hsr: Use list_head (and rcu) instead of array for slave devices.

2014-07-08T18:35:31+00:00

Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

net/hsr: Move slave init to hsr_slave.c.

2014-07-08T18:35:31+00:00

Also try to prevent some possible slave dereference race conditions. This is finalized in the next patch, which abandons the slave array in favour of a list_head list and list RCU. Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

net/hsr: Move to per-hsr device prune timer.

2014-07-08T18:35:30+00:00

Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

net/hsr: Better variable names and update of contact info.

2014-07-08T18:35:30+00:00

Signed-off-by: Arvid Brodin Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-06T01:32:02+00:00

Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller

hsr: off by one sanity check in hsr_register_frame_in()

2014-03-03T20:29:42+00:00

This is a sanity check and we never pass invalid values so this patch doesn't change anything. However the node->time_in[] array has HSR_MAX_SLAVE (2) elements and not HSR_MAX_DEV (3). Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller

hsr: Use ether_addr_copy

2014-02-18T23:14:09+00:00

It's slightly smaller/faster for some architectures. Make sure def_multicast_addr is __aligned(2) Signed-off-by: Joe Perches Signed-off-by: David S. Miller

net/hsr: using kfree_rcu() to simplify the code

2013-12-17T21:32:30+00:00

The callback function of call_rcu() just calls a kfree(), so we can use kfree_rcu() instead of call_rcu() + callback function. Signed-off-by: Wei Yongjun Acked-by: Arvid Brodin Signed-off-by: David S. Miller