From: Subash Abhinov Kasiviswanathan <subas...@codeaurora.org> Date: Mon, 12 Mar 2018 20:26:06 -0600
> diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > index 6ce31e2..65b074e 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h > @@ -44,7 +44,7 @@ struct rmnet_map_header { > u8 reserved_bit:1; > u8 cd_bit:1; > u8 mux_id; > - u16 pkt_len; > + __be16 pkt_len; > } __aligned(1); > > struct rmnet_map_dl_csum_trailer { ... > diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > index c74a6c5..4e342a3 100644 > --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c > @@ -307,7 +307,8 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, > return NULL; > > maph = (struct rmnet_map_header *)skb->data; > - packet_len = ntohs(maph->pkt_len) + sizeof(struct rmnet_map_header); > + packet_len = ntohs((__force __be16)maph->pkt_len) + > + sizeof(struct rmnet_map_header); > > if (port->data_format & RMNET_INGRESS_FORMAT_MAP_CKSUMV4) > packet_len += sizeof(struct rmnet_map_dl_csum_trailer); > @@ -316,7 +317,7 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb, > return NULL; > > /* Some hardware can send us empty frames. Catch them */ > - if (ntohs(maph->pkt_len) == 0) > + if (ntohs((__force __be16)maph->pkt_len) == 0) > return NULL; > > skbn = alloc_skb(packet_len + RMNET_MAP_DEAGGR_SPACING, GFP_ATOMIC); Ummm, if you change pkt_len to be a proper __be16, then you don't need these casts when passing it to ntohs().