mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
86ca860e12
Replace the use of C bit-fields in the rmnet_map_ul_csum_header structure with a single two-byte (big endian) structure member, and use masks to encode or get values within it. The content of these fields can be accessed using simple bitwise AND and OR operations on the (host byte order) value of the new structure member. Previously rmnet_map_ipv4_ul_csum_header() would update C bit-field values in host byte order, then forcibly fix their byte order using a combination of byte swap operations and types. Instead, just compute the value that needs to go into the new structure member and save it with a simple byte-order conversion. Make similar simplifications in rmnet_map_ipv6_ul_csum_header(). Finally, in rmnet_map_checksum_uplink_packet() a set of assignments zeroes every field in the upload checksum header. Replace that with a single memset() operation. Signed-off-by: Alex Elder <elder@linaro.org> Reviewed-by: Alexander Duyck <alexanderduyck@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
48 lines
1.3 KiB
C
48 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only
|
|
* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _LINUX_IF_RMNET_H_
|
|
#define _LINUX_IF_RMNET_H_
|
|
|
|
struct rmnet_map_header {
|
|
u8 flags; /* MAP_CMD_FLAG, MAP_PAD_LEN_MASK */
|
|
u8 mux_id;
|
|
__be16 pkt_len; /* Length of packet, including pad */
|
|
} __aligned(1);
|
|
|
|
/* rmnet_map_header flags field:
|
|
* PAD_LEN: number of pad bytes following packet data
|
|
* CMD: 1 = packet contains a MAP command; 0 = packet contains data
|
|
*/
|
|
#define MAP_PAD_LEN_MASK GENMASK(5, 0)
|
|
#define MAP_CMD_FLAG BIT(7)
|
|
|
|
struct rmnet_map_dl_csum_trailer {
|
|
u8 reserved1;
|
|
u8 flags; /* MAP_CSUM_DL_VALID_FLAG */
|
|
__be16 csum_start_offset;
|
|
__be16 csum_length;
|
|
__be16 csum_value;
|
|
} __aligned(1);
|
|
|
|
/* rmnet_map_dl_csum_trailer flags field:
|
|
* VALID: 1 = checksum and length valid; 0 = ignore them
|
|
*/
|
|
#define MAP_CSUM_DL_VALID_FLAG BIT(0)
|
|
|
|
struct rmnet_map_ul_csum_header {
|
|
__be16 csum_start_offset;
|
|
__be16 csum_info; /* MAP_CSUM_UL_* */
|
|
} __aligned(1);
|
|
|
|
/* csum_info field:
|
|
* OFFSET: where (offset in bytes) to insert computed checksum
|
|
* UDP: 1 = UDP checksum (zero checkum means no checksum)
|
|
* ENABLED: 1 = checksum computation requested
|
|
*/
|
|
#define MAP_CSUM_UL_OFFSET_MASK GENMASK(13, 0)
|
|
#define MAP_CSUM_UL_UDP_FLAG BIT(14)
|
|
#define MAP_CSUM_UL_ENABLED_FLAG BIT(15)
|
|
|
|
#endif /* !(_LINUX_IF_RMNET_H_) */
|