diff options
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_device.c | 7 | ||||
| -rw-r--r-- | net/hsr/hsr_main.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 0aea1bd09526..567c890f08a5 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -254,10 +254,9 @@ static void send_hsr_supervision_frame(struct hsr_port *master, hlen = LL_RESERVED_SPACE(master->dev); tlen = master->dev->needed_tailroom; - skb = dev_alloc_skb( - sizeof(struct hsr_tag) + - sizeof(struct hsr_sup_tag) + - sizeof(struct hsr_sup_payload) + hlen + tlen); + skb = dev_alloc_skb(sizeof(struct hsr_tag) + + sizeof(struct hsr_sup_tag) + + sizeof(struct hsr_sup_payload) + hlen + tlen); if (skb == NULL) return; diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index 3504f0647942..1b640731d705 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -84,9 +84,8 @@ static inline void set_hsr_tag_path(struct hsr_tag *ht, u16 path) static inline void set_hsr_tag_LSDU_size(struct hsr_tag *ht, u16 LSDU_size) { - ht->path_and_LSDU_size = htons( - (ntohs(ht->path_and_LSDU_size) & 0xF000) | - (LSDU_size & 0x0FFF)); + ht->path_and_LSDU_size = htons((ntohs(ht->path_and_LSDU_size) & + 0xF000) | (LSDU_size & 0x0FFF)); } struct hsr_ethhdr { |