microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

s390/ctcm: improve endianness handling 

Use endianness conversions for SKB protocol assignments and usage to
avoid endianness warnings reported by sparse. No functional changes.

Signed-off-by: Hans Wippel <hwippel@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hans Wippel 2017-04-07 09:15:37 +02:00 коммит произвёл David S. Miller
Родитель 6bee4e26a3
Коммит 5cd77c1356
2 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/s390/net/ctcm_fsms.c
Просмотреть файл

@ -1283,7 +1283,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)
p_header = (struct pdu *) p_header = (struct pdu *)
(skb_tail_pointer(ch->trans_skb) - skb->len); (skb_tail_pointer(ch->trans_skb) - skb->len);
p_header->pdu_flag = 0x00; p_header->pdu_flag = 0x00;
if (skb->protocol == ntohs(ETH_P_SNAP)) if (be16_to_cpu(skb->protocol) == ETH_P_SNAP)
p_header->pdu_flag |= 0x60; p_header->pdu_flag |= 0x60;
else else
p_header->pdu_flag |= 0x20; p_header->pdu_flag |= 0x20;

10
drivers/s390/net/ctcm_main.c
Просмотреть файл

@ -106,7 +106,7 @@ void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb)
priv->stats.rx_frame_errors++; priv->stats.rx_frame_errors++;
return; return;
} }
pskb->protocol = ntohs(header->type); pskb->protocol = cpu_to_be16(header->type);
if ((header->length <= LL_HEADER_LENGTH) || if ((header->length <= LL_HEADER_LENGTH) ||
(len <= LL_HEADER_LENGTH)) { (len <= LL_HEADER_LENGTH)) {
if (!(ch->logflags & LOG_FLAG_ILLEGALSIZE)) { if (!(ch->logflags & LOG_FLAG_ILLEGALSIZE)) {
@ -485,7 +485,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
} else { } else {
atomic_inc(&skb->users); atomic_inc(&skb->users);
header.length = l; header.length = l;
header.type = skb->protocol; header.type = be16_to_cpu(skb->protocol);
header.unused = 0; header.unused = 0;
memcpy(skb_push(skb, LL_HEADER_LENGTH), &header, memcpy(skb_push(skb, LL_HEADER_LENGTH), &header,
LL_HEADER_LENGTH); LL_HEADER_LENGTH);
@ -503,7 +503,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb)
atomic_inc(&skb->users); atomic_inc(&skb->users);
ch->prof.txlen += skb->len; ch->prof.txlen += skb->len;
header.length = skb->len + LL_HEADER_LENGTH; header.length = skb->len + LL_HEADER_LENGTH;
header.type = skb->protocol; header.type = be16_to_cpu(skb->protocol);
header.unused = 0; header.unused = 0;
memcpy(skb_push(skb, LL_HEADER_LENGTH), &header, LL_HEADER_LENGTH); memcpy(skb_push(skb, LL_HEADER_LENGTH), &header, LL_HEADER_LENGTH);
block_len = skb->len + 2; block_len = skb->len + 2;
@ -690,7 +690,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
p_header->pdu_offset = skb->len; p_header->pdu_offset = skb->len;
p_header->pdu_proto = 0x01; p_header->pdu_proto = 0x01;
p_header->pdu_flag = 0x00; p_header->pdu_flag = 0x00;
if (skb->protocol == ntohs(ETH_P_SNAP)) { if (be16_to_cpu(skb->protocol) == ETH_P_SNAP) {
p_header->pdu_flag |= PDU_FIRST | PDU_CNTL; p_header->pdu_flag |= PDU_FIRST | PDU_CNTL;
} else { } else {
p_header->pdu_flag |= PDU_FIRST; p_header->pdu_flag |= PDU_FIRST;
@ -745,7 +745,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)
p_header->pdu_proto = 0x01; p_header->pdu_proto = 0x01;
p_header->pdu_flag = 0x00; p_header->pdu_flag = 0x00;
p_header->pdu_seq = 0; p_header->pdu_seq = 0;
if (skb->protocol == ntohs(ETH_P_SNAP)) { if (be16_to_cpu(skb->protocol) == ETH_P_SNAP) {
p_header->pdu_flag |= PDU_FIRST | PDU_CNTL; p_header->pdu_flag |= PDU_FIRST | PDU_CNTL;
} else { } else {
p_header->pdu_flag |= PDU_FIRST; p_header->pdu_flag |= PDU_FIRST;