Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1fe87f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: rmnet_data: Move MAP header definition to UAPI"

parents b9296193 c4c80c54

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ header-y += ncp_no.h 
header-y += neighbour.h

header-y += net.h

header-y += net_dropmon.h

header-y += net_map.h

header-y += net_tstamp.h

header-y += netconf.h

header-y += netdevice.h

include/uapi/linux/net_map.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef _NET_MAP_H_

#define _NET_MAP_H_



struct rmnet_map_header_s {

#ifndef RMNET_USE_BIG_ENDIAN_STRUCTS

	uint8_t  pad_len:6;

	uint8_t  reserved_bit:1;

	uint8_t  cd_bit:1;

#else

	uint8_t  cd_bit:1;

	uint8_t  reserved_bit:1;

	uint8_t  pad_len:6;

#endif /* RMNET_USE_BIG_ENDIAN_STRUCTS */

	uint8_t  mux_id;

	uint16_t pkt_len;

}  __aligned(1);



#define RMNET_MAP_GET_MUX_ID(Y) (((struct rmnet_map_header_s *)Y->data)->mux_id)

#define RMNET_MAP_GET_CD_BIT(Y) (((struct rmnet_map_header_s *)Y->data)->cd_bit)

#define RMNET_MAP_GET_PAD(Y) (((struct rmnet_map_header_s *)Y->data)->pad_len)

#define RMNET_MAP_GET_CMD_START(Y) ((struct rmnet_map_control_command_s *) \

				  (Y->data + sizeof(struct rmnet_map_header_s)))

#define RMNET_MAP_GET_LENGTH(Y) (ntohs( \

			       ((struct rmnet_map_header_s *)Y->data)->pkt_len))





#endif /* _NET_MAP_H_ */

net/rmnet_data/rmnet_data_handlers.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/netdevice.h>

#include <linux/module.h>

#include <linux/rmnet_data.h>

#include <linux/net_map.h>

#include "rmnet_data_private.h"

#include "rmnet_data_config.h"

#include "rmnet_data_vnd.h"

net/rmnet_data/rmnet_data_vnd.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/spinlock.h>

#include <net/pkt_sched.h>

#include <linux/atomic.h>

#include <linux/net_map.h>

#include "rmnet_data_config.h"

#include "rmnet_data_handlers.h"

#include "rmnet_data_private.h"

net/rmnet_data/rmnet_map.h

+1 −23
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,20 +17,6 @@ 
#ifndef _RMNET_MAP_H_

#define _RMNET_MAP_H_



struct rmnet_map_header_s {

#ifndef RMNET_USE_BIG_ENDIAN_STRUCTS

	uint8_t  pad_len:6;

	uint8_t  reserved_bit:1;

	uint8_t  cd_bit:1;

#else

	uint8_t  cd_bit:1;

	uint8_t  reserved_bit:1;

	uint8_t  pad_len:6;

#endif /* RMNET_USE_BIG_ENDIAN_STRUCTS */

	uint8_t  mux_id;

	uint16_t pkt_len;

}  __aligned(1);



struct rmnet_map_control_command_s {

	uint8_t command_name;

#ifndef RMNET_USE_BIG_ENDIAN_STRUCTS
@@ -117,14 +103,6 @@ uint8_t rmnet_map_demultiplex(struct sk_buff *skb); 
struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,

				      struct rmnet_phys_ep_conf_s *config);



#define RMNET_MAP_GET_MUX_ID(Y) (((struct rmnet_map_header_s *)Y->data)->mux_id)

#define RMNET_MAP_GET_CD_BIT(Y) (((struct rmnet_map_header_s *)Y->data)->cd_bit)

#define RMNET_MAP_GET_PAD(Y) (((struct rmnet_map_header_s *)Y->data)->pad_len)

#define RMNET_MAP_GET_CMD_START(Y) ((struct rmnet_map_control_command_s *) \

				  (Y->data + sizeof(struct rmnet_map_header_s)))

#define RMNET_MAP_GET_LENGTH(Y) (ntohs( \

			       ((struct rmnet_map_header_s *)Y->data)->pkt_len))



struct rmnet_map_header_s *rmnet_map_add_map_header(struct sk_buff *skb,

						    int hdrlen);

rx_handler_result_t rmnet_map_command(struct sk_buff *skb,