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

Commit cf2fe57b authored by Subash Abhinov Kasiviswanathan's avatar Subash Abhinov Kasiviswanathan Committed by David S. Miller
Browse files

net: qualcomm: rmnet: Remove the rmnet_map_results enum 



Only the success and consumed entries were actually in use.
Use standard error codes instead.

Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4f70c3d

drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

+3 −12
Original line number Diff line number Diff line
@@ -142,11 +142,11 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 


	skb->protocol = htons(ETH_P_MAP);



	return RMNET_MAP_SUCCESS;

	return 0;



fail:

	kfree_skb(skb);

	return RMNET_MAP_CONSUMED;

	return -ENOMEM;

}



static void
@@ -213,17 +213,8 @@ void rmnet_egress_handler(struct sk_buff *skb) 
	}



	if (port->egress_data_format & RMNET_EGRESS_FORMAT_MAP) {

		switch (rmnet_map_egress_handler(skb, port, mux_id, orig_dev)) {

		case RMNET_MAP_CONSUMED:

		if (rmnet_map_egress_handler(skb, port, mux_id, orig_dev))

			return;



		case RMNET_MAP_SUCCESS:

			break;



		default:

			kfree_skb(skb);

			return;

		}

	}



	rmnet_vnd_tx_fixup(skb, orig_dev);

drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h

+0 −9
Original line number Diff line number Diff line
@@ -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,