9d131d044f
The following macros, defined in "rmnet_map.h", assume a socket
buffer is provided as an argument without any real indication this
is the case.
RMNET_MAP_GET_MUX_ID()
RMNET_MAP_GET_CD_BIT()
RMNET_MAP_GET_PAD()
RMNET_MAP_GET_CMD_START()
RMNET_MAP_GET_LENGTH()
What they hide is pretty trivial accessing of fields in a structure,
and it's much clearer to see this if we do these accesses directly.
So rather than using these accessor macros, assign a local
variable of the map header pointer type to the socket buffer data
pointer, and derereference that pointer variable.
In "rmnet_map_data.c", use sizeof(object) rather than sizeof(type)
in one spot. Also, there's no need to byte swap 0; it's all zeros
irrespective of endianness.
Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
53 lines
1.4 KiB
C
53 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _RMNET_MAP_H_
|
|
#define _RMNET_MAP_H_
|
|
#include <linux/if_rmnet.h>
|
|
|
|
struct rmnet_map_control_command {
|
|
u8 command_name;
|
|
u8 cmd_type:2;
|
|
u8 reserved:6;
|
|
u16 reserved2;
|
|
u32 transaction_id;
|
|
union {
|
|
struct {
|
|
u16 ip_family:2;
|
|
u16 reserved:14;
|
|
__be16 flow_control_seq_num;
|
|
__be32 qos_id;
|
|
} flow_control;
|
|
u8 data[0];
|
|
};
|
|
} __aligned(1);
|
|
|
|
enum rmnet_map_commands {
|
|
RMNET_MAP_COMMAND_NONE,
|
|
RMNET_MAP_COMMAND_FLOW_DISABLE,
|
|
RMNET_MAP_COMMAND_FLOW_ENABLE,
|
|
/* These should always be the last 2 elements */
|
|
RMNET_MAP_COMMAND_UNKNOWN,
|
|
RMNET_MAP_COMMAND_ENUM_LENGTH
|
|
};
|
|
|
|
#define RMNET_MAP_COMMAND_REQUEST 0
|
|
#define RMNET_MAP_COMMAND_ACK 1
|
|
#define RMNET_MAP_COMMAND_UNSUPPORTED 2
|
|
#define RMNET_MAP_COMMAND_INVALID 3
|
|
|
|
#define RMNET_MAP_NO_PAD_BYTES 0
|
|
#define RMNET_MAP_ADD_PAD_BYTES 1
|
|
|
|
struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,
|
|
struct rmnet_port *port);
|
|
struct rmnet_map_header *rmnet_map_add_map_header(struct sk_buff *skb,
|
|
int hdrlen, int pad);
|
|
void rmnet_map_command(struct sk_buff *skb, struct rmnet_port *port);
|
|
int rmnet_map_checksum_downlink_packet(struct sk_buff *skb, u16 len);
|
|
void rmnet_map_checksum_uplink_packet(struct sk_buff *skb,
|
|
struct net_device *orig_dev);
|
|
|
|
#endif /* _RMNET_MAP_H_ */
|