diff options
| author | Peter Heise <mail@pheise.de> | 2016-04-13 13:52:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-15 23:06:48 +0200 |
| commit | ee1c27977284907d40f7f72c2d078d709f15811f (patch) | |
| tree | 58c578e321dd8baad0af86ecaf41e6e2f34ddb34 /net/hsr/hsr_device.h | |
| parent | Merge branch 'tcp-synflood-perf' (diff) | |
| download | linux-ee1c27977284907d40f7f72c2d078d709f15811f.tar.xz linux-ee1c27977284907d40f7f72c2d078d709f15811f.zip | |
net/hsr: Added support for HSR v1
This patch adds support for the newer version 1 of the HSR
networking standard. Version 0 is still default and the new
version has to be selected via iproute2.
Main changes are in the supervision frame handling and its
ethertype field.
Signed-off-by: Peter Heise <peter.heise@airbus.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr/hsr_device.h')
| -rw-r--r-- | net/hsr/hsr_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hsr/hsr_device.h b/net/hsr/hsr_device.h index 108a5d59d2a6..9975e31bbb82 100644 --- a/net/hsr/hsr_device.h +++ b/net/hsr/hsr_device.h @@ -17,7 +17,7 @@ void hsr_dev_setup(struct net_device *dev); int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], - unsigned char multicast_spec); + unsigned char multicast_spec, u8 protocol_version); void hsr_check_carrier_and_operstate(struct hsr_priv *hsr); bool is_hsr_master(struct net_device *dev); int hsr_get_max_mtu(struct hsr_priv *hsr); |