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

Commit 22bbf5f3 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

llc: Make llc_sap_action_t function pointer arrays const 



It's better when function pointer arrays aren't modifiable.

Net change:

$ size net/llc/built-in.o.*
   text	   data	    bss	    dec	    hex	filename
  61193	  12758	   1344	  75295	  1261f	net/llc/built-in.o.new
  47113	  27030	   1344	  75487	  126df	net/llc/built-in.o.old

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b373069

include/net/llc_s_st.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
struct llc_sap_state_trans {

	llc_sap_ev_t	  ev;

	u8		  next_state;

	llc_sap_action_t *ev_actions;

	const llc_sap_action_t *ev_actions;

};



struct llc_sap_state {

net/llc/llc_s_st.c

+10 −10
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct llc_sap_state_trans llc_sap_state_trans_end; 
/* state LLC_SAP_STATE_INACTIVE transition for

 * LLC_SAP_EV_ACTIVATION_REQ event

 */

static llc_sap_action_t llc_sap_inactive_state_actions_1[] = {

static const llc_sap_action_t llc_sap_inactive_state_actions_1[] = {

	[0] = llc_sap_action_report_status,

	[1] = NULL,

};
@@ -47,7 +47,7 @@ static struct llc_sap_state_trans *llc_sap_inactive_state_transitions[] = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_UI event */

static llc_sap_action_t llc_sap_active_state_actions_1[] = {

static const llc_sap_action_t llc_sap_active_state_actions_1[] = {

	[0] = llc_sap_action_unitdata_ind,

	[1] = NULL,

};
@@ -59,7 +59,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_1 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_UNITDATA_REQ event */

static llc_sap_action_t llc_sap_active_state_actions_2[] = {

static const llc_sap_action_t llc_sap_active_state_actions_2[] = {

	[0] = llc_sap_action_send_ui,

	[1] = NULL,

};
@@ -71,7 +71,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_2 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_XID_REQ event */

static llc_sap_action_t llc_sap_active_state_actions_3[] = {

static const llc_sap_action_t llc_sap_active_state_actions_3[] = {

	[0] = llc_sap_action_send_xid_c,

	[1] = NULL,

};
@@ -83,7 +83,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_3 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_C event */

static llc_sap_action_t llc_sap_active_state_actions_4[] = {

static const llc_sap_action_t llc_sap_active_state_actions_4[] = {

	[0] = llc_sap_action_send_xid_r,

	[1] = NULL,

};
@@ -95,7 +95,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_4 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_R event */

static llc_sap_action_t llc_sap_active_state_actions_5[] = {

static const llc_sap_action_t llc_sap_active_state_actions_5[] = {

	[0] = llc_sap_action_xid_ind,

	[1] = NULL,

};
@@ -107,7 +107,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_5 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_TEST_REQ event */

static llc_sap_action_t llc_sap_active_state_actions_6[] = {

static const llc_sap_action_t llc_sap_active_state_actions_6[] = {

	[0] = llc_sap_action_send_test_c,

	[1] = NULL,

};
@@ -119,7 +119,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_6 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_C event */

static llc_sap_action_t llc_sap_active_state_actions_7[] = {

static const llc_sap_action_t llc_sap_active_state_actions_7[] = {

	[0] = llc_sap_action_send_test_r,

	[1] = NULL,

};
@@ -131,7 +131,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_7 = { 
};



/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_R event */

static llc_sap_action_t llc_sap_active_state_actions_8[] = {

static const llc_sap_action_t llc_sap_active_state_actions_8[] = {

	[0] = llc_sap_action_test_ind,

	[1] = NULL,

};
@@ -145,7 +145,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_8 = { 
/* state LLC_SAP_STATE_ACTIVE transition for

 * LLC_SAP_EV_DEACTIVATION_REQ event

 */

static llc_sap_action_t llc_sap_active_state_actions_9[] = {

static const llc_sap_action_t llc_sap_active_state_actions_9[] = {

	[0] = llc_sap_action_report_status,

	[1] = NULL,

};

net/llc/llc_sap.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int llc_exec_sap_trans_actions(struct llc_sap *sap, 
				      struct sk_buff *skb)

{

	int rc = 0;

	llc_sap_action_t *next_action = trans->ev_actions;

	const llc_sap_action_t *next_action = trans->ev_actions;



	for (; next_action && *next_action; next_action++)

		if ((*next_action)(sap, skb))