diff options
author | Arvid Brodin <arvid.brodin@alten.se> | 2014-07-04 23:41:03 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-08 20:35:31 +0200 |
commit | f266a683a4804dc499efc6c2206ef68efed029d0 (patch) | |
tree | 8af16a2a5dc8d101e0f1aa4681452a939179c957 /net/hsr/Makefile | |
parent | net/hsr: Added SET_NETDEV_DEVTYPE and features |= NETIF_F_NETNS_LOCAL to dev_... (diff) | |
download | linux-f266a683a4804dc499efc6c2206ef68efed029d0.tar.xz linux-f266a683a4804dc499efc6c2206ef68efed029d0.zip |
net/hsr: Better frame dispatch
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 <arvid.brodin@alten.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr/Makefile')
-rw-r--r-- | net/hsr/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/hsr/Makefile b/net/hsr/Makefile index b533b243a48b..9ae972a820f4 100644 --- a/net/hsr/Makefile +++ b/net/hsr/Makefile @@ -4,5 +4,5 @@ obj-$(CONFIG_HSR) += hsr.o -hsr-y := hsr_main.o hsr_framereg.o hsr_device.o hsr_netlink.o \ - hsr_slave.o +hsr-y := hsr_main.o hsr_framereg.o hsr_device.o \ + hsr_netlink.o hsr_slave.o hsr_forward.o |