summaryrefslogtreecommitdiffstats
path: root/net/hsr/hsr_device.h
diff options
context:
space:
mode:
authorArvid Brodin <arvid.brodin@alten.se>2014-07-04 23:36:40 +0200
committerDavid S. Miller <davem@davemloft.net>2014-07-08 11:35:30 -0700
commite9aae56ea43ef4a32527b9d86c1f6b5eebfbd223 (patch)
tree9d98af0ddd4feed4266745d7a2b5fcc45445e65c /net/hsr/hsr_device.h
parentabff7162765cd66ab109c97fd433ef1f39299120 (diff)
downloadlinux-e9aae56ea43ef4a32527b9d86c1f6b5eebfbd223.tar.bz2
net/hsr: Operstate handling cleanup.
Signed-off-by: Arvid Brodin <arvid.brodin@alten.se> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr/hsr_device.h')
-rw-r--r--net/hsr/hsr_device.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/hsr/hsr_device.h b/net/hsr/hsr_device.h
index feb744f90f3d..108a5d59d2a6 100644
--- a/net/hsr/hsr_device.h
+++ b/net/hsr/hsr_device.h
@@ -18,11 +18,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);
-void hsr_set_operstate(struct net_device *hsr_dev, struct net_device *slave1,
- struct net_device *slave2);
-void hsr_set_carrier(struct net_device *hsr_dev, struct net_device *slave1,
- struct net_device *slave2);
-void hsr_check_announce(struct net_device *hsr_dev, int old_operstate);
+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);