Skip to contentSkip to conversation

net: qualcomm: rmnet: Move common struct definitions to include

PATCH Applied Subash Abhinov Kasiviswanathan 2 participants 2 messages May 22, 2019 – May 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: qualcomm: rmnet: Move common struct definitions to include

Create if_rmnet.h and move the rmnet MAP packet structs to this common include file. To account for portablity, add little and big endian bitfield definitions similar to the ip & tcp headers.

The definitions in the headers can now be re-used by the upcoming ipa driver series as well as qmi_wwan.

---
 drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 25 +----------
 include/linux/if_rmnet.h                        | 55 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 include/linux/if_rmnet.h
drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h +1 -24
index 884f1f5..991d7e2 100644
@@ -12,6 +12,7 @@
 
 #ifndef _RMNET_MAP_H_
 #define _RMNET_MAP_H_
+#include <linux/if_rmnet.h>
 
 struct rmnet_map_control_command {
 	u8  command_name;
@@ -39,30 +40,6 @@ enum rmnet_map_commands {
 	RMNET_MAP_COMMAND_ENUM_LENGTH
 };
 
-struct rmnet_map_header {
-	u8  pad_len:6;
-	u8  reserved_bit:1;
-	u8  cd_bit:1;
-	u8  mux_id;
-	__be16 pkt_len;
-}  __aligned(1);
-
-struct rmnet_map_dl_csum_trailer {
-	u8  reserved1;
-	u8  valid:1;
-	u8  reserved2:7;
-	u16 csum_start_offset;
-	u16 csum_length;
-	__be16 csum_value;
-} __aligned(1);
-
-struct rmnet_map_ul_csum_header {
-	__be16 csum_start_offset;
-	u16 csum_insert_offset:14;
-	u16 udp_ip4_ind:1;
-	u16 csum_enabled:1;
-} __aligned(1);
-
 #define RMNET_MAP_GET_MUX_ID(Y) (((struct rmnet_map_header *) \
 				 (Y)->data)->mux_id)
 #define RMNET_MAP_GET_CD_BIT(Y) (((struct rmnet_map_header *) \
include/linux/if_rmnet.h new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw

From: Subash Abhinov Kasiviswanathan <[email protected]>
Date: Wed, 22 May 2019 14:21:07 -0600

Quoted 8 lines

Create if_rmnet.h and move the rmnet MAP packet structs to this common include file. To account for portablity, add little and big endian bitfield definitions similar to the ip & tcp headers.

The definitions in the headers can now be re-used by the upcoming ipa driver series as well as qmi_wwan.

Applied.