aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-12-10 12:55:50 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-10 15:21:24 -0500
commit22bbf5f3e4e4db4a94f18d7b1ba21b5bd5fd934b (patch)
tree2cebf757144a87b4fbfc3d4feebc4cb61338cd61 /net/llc
parent9b373069350d747c4e7ad7ea59f0fa348e860383 (diff)
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: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc')
-rw-r--r--net/llc/llc_s_st.c20
-rw-r--r--net/llc/llc_sap.c2
2 files changed, 11 insertions, 11 deletions
diff --git a/net/llc/llc_s_st.c b/net/llc/llc_s_st.c
index 135f7d80069e..308c616883a4 100644
--- a/net/llc/llc_s_st.c
+++ b/net/llc/llc_s_st.c
@@ -29,7 +29,7 @@ static struct llc_sap_state_trans llc_sap_state_trans_end;
29/* state LLC_SAP_STATE_INACTIVE transition for 29/* state LLC_SAP_STATE_INACTIVE transition for
30 * LLC_SAP_EV_ACTIVATION_REQ event 30 * LLC_SAP_EV_ACTIVATION_REQ event
31 */ 31 */
32static llc_sap_action_t llc_sap_inactive_state_actions_1[] = { 32static const llc_sap_action_t llc_sap_inactive_state_actions_1[] = {
33 [0] = llc_sap_action_report_status, 33 [0] = llc_sap_action_report_status,
34 [1] = NULL, 34 [1] = NULL,
35}; 35};
@@ -47,7 +47,7 @@ static struct llc_sap_state_trans *llc_sap_inactive_state_transitions[] = {
47}; 47};
48 48
49/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_UI event */ 49/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_UI event */
50static llc_sap_action_t llc_sap_active_state_actions_1[] = { 50static const llc_sap_action_t llc_sap_active_state_actions_1[] = {
51 [0] = llc_sap_action_unitdata_ind, 51 [0] = llc_sap_action_unitdata_ind,
52 [1] = NULL, 52 [1] = NULL,
53}; 53};
@@ -59,7 +59,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_1 = {
59}; 59};
60 60
61/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_UNITDATA_REQ event */ 61/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_UNITDATA_REQ event */
62static llc_sap_action_t llc_sap_active_state_actions_2[] = { 62static const llc_sap_action_t llc_sap_active_state_actions_2[] = {
63 [0] = llc_sap_action_send_ui, 63 [0] = llc_sap_action_send_ui,
64 [1] = NULL, 64 [1] = NULL,
65}; 65};
@@ -71,7 +71,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_2 = {
71}; 71};
72 72
73/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_XID_REQ event */ 73/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_XID_REQ event */
74static llc_sap_action_t llc_sap_active_state_actions_3[] = { 74static const llc_sap_action_t llc_sap_active_state_actions_3[] = {
75 [0] = llc_sap_action_send_xid_c, 75 [0] = llc_sap_action_send_xid_c,
76 [1] = NULL, 76 [1] = NULL,
77}; 77};
@@ -83,7 +83,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_3 = {
83}; 83};
84 84
85/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_C event */ 85/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_C event */
86static llc_sap_action_t llc_sap_active_state_actions_4[] = { 86static const llc_sap_action_t llc_sap_active_state_actions_4[] = {
87 [0] = llc_sap_action_send_xid_r, 87 [0] = llc_sap_action_send_xid_r,
88 [1] = NULL, 88 [1] = NULL,
89}; 89};
@@ -95,7 +95,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_4 = {
95}; 95};
96 96
97/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_R event */ 97/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_XID_R event */
98static llc_sap_action_t llc_sap_active_state_actions_5[] = { 98static const llc_sap_action_t llc_sap_active_state_actions_5[] = {
99 [0] = llc_sap_action_xid_ind, 99 [0] = llc_sap_action_xid_ind,
100 [1] = NULL, 100 [1] = NULL,
101}; 101};
@@ -107,7 +107,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_5 = {
107}; 107};
108 108
109/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_TEST_REQ event */ 109/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_TEST_REQ event */
110static llc_sap_action_t llc_sap_active_state_actions_6[] = { 110static const llc_sap_action_t llc_sap_active_state_actions_6[] = {
111 [0] = llc_sap_action_send_test_c, 111 [0] = llc_sap_action_send_test_c,
112 [1] = NULL, 112 [1] = NULL,
113}; 113};
@@ -119,7 +119,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_6 = {
119}; 119};
120 120
121/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_C event */ 121/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_C event */
122static llc_sap_action_t llc_sap_active_state_actions_7[] = { 122static const llc_sap_action_t llc_sap_active_state_actions_7[] = {
123 [0] = llc_sap_action_send_test_r, 123 [0] = llc_sap_action_send_test_r,
124 [1] = NULL, 124 [1] = NULL,
125}; 125};
@@ -131,7 +131,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_7 = {
131}; 131};
132 132
133/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_R event */ 133/* state LLC_SAP_STATE_ACTIVE transition for LLC_SAP_EV_RX_TEST_R event */
134static llc_sap_action_t llc_sap_active_state_actions_8[] = { 134static const llc_sap_action_t llc_sap_active_state_actions_8[] = {
135 [0] = llc_sap_action_test_ind, 135 [0] = llc_sap_action_test_ind,
136 [1] = NULL, 136 [1] = NULL,
137}; 137};
@@ -145,7 +145,7 @@ static struct llc_sap_state_trans llc_sap_active_state_trans_8 = {
145/* state LLC_SAP_STATE_ACTIVE transition for 145/* state LLC_SAP_STATE_ACTIVE transition for
146 * LLC_SAP_EV_DEACTIVATION_REQ event 146 * LLC_SAP_EV_DEACTIVATION_REQ event
147 */ 147 */
148static llc_sap_action_t llc_sap_active_state_actions_9[] = { 148static const llc_sap_action_t llc_sap_active_state_actions_9[] = {
149 [0] = llc_sap_action_report_status, 149 [0] = llc_sap_action_report_status,
150 [1] = NULL, 150 [1] = NULL,
151}; 151};
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 06033f6c845f..d0e1e804ebd7 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -146,7 +146,7 @@ static int llc_exec_sap_trans_actions(struct llc_sap *sap,
146 struct sk_buff *skb) 146 struct sk_buff *skb)
147{ 147{
148 int rc = 0; 148 int rc = 0;
149 llc_sap_action_t *next_action = trans->ev_actions; 149 const llc_sap_action_t *next_action = trans->ev_actions;
150 150
151 for (; next_action && *next_action; next_action++) 151 for (; next_action && *next_action; next_action++)
152 if ((*next_action)(sap, skb)) 152 if ((*next_action)(sap, skb))