diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-13 14:01:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-13 14:01:09 -0500 |
commit | 1e7570117575360504e632d0c31d6b52d3d7ea9c (patch) | |
tree | 4e45641f215f7259b0b8b29b1e78c74b09da2169 /drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | |
parent | tcp: allow TLP in ECN CWR (diff) | |
parent | net: qualcomm: rmnet: Allow to configure flags for existing devices (diff) | |
download | linux-dev-1e7570117575360504e632d0c31d6b52d3d7ea9c.tar.xz linux-dev-1e7570117575360504e632d0c31d6b52d3d7ea9c.zip |
Merge branch 'rmnet-Configuration-options'
Subash Abhinov Kasiviswanathan says:
====================
net: qualcomm: rmnet: Configuration options
This series adds support for configuring features on rmnet devices.
The rmnet specific features to be configured here are aggregation and
control commands.
Patch 1 is a cleanup of return codes in the transmit path.
Patch 2 removes some redundant ingress and egress macros.
Patch 3 restricts the creation of rmnet dev to one dev per mux id for a
given real dev.
Patch 4 adds ethernet data path support.
Patches 5-6 add support for configuring features on new and existing
rmnet devices.
v1->v2:
The memory leak fixed as part of patch 1 is merged seperately as
a896d94abd2c ("net: qualcomm: rmnet: Fix leak on transmit failure").
Fix a use after free in patch 4 if a packet with headroom lesser than ethernet
header length is received.
v2->v3:
Fix formatting problem in patch 5 in the return statement.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h')
-rw-r--r-- | drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h index 3af3fe7b5457..4df359de28c5 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h @@ -30,15 +30,6 @@ struct rmnet_map_control_command { }; } __aligned(1); -enum rmnet_map_results { - RMNET_MAP_SUCCESS, - RMNET_MAP_CONSUMED, - RMNET_MAP_GENERAL_FAILURE, - RMNET_MAP_NOT_ENABLED, - RMNET_MAP_FAILED_AGGREGATION, - RMNET_MAP_FAILED_MUX -}; - enum rmnet_map_commands { RMNET_MAP_COMMAND_NONE, RMNET_MAP_COMMAND_FLOW_DISABLE, |