diff options
author | stephen hemminger <stephen@networkplumber.org> | 2014-03-04 19:36:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-06 16:08:52 -0500 |
commit | f3253339a47ff3690ce52e2acd95ec295f8521b3 (patch) | |
tree | b1785d926e67f74c09549a3b070541c17e409b5e /drivers/net/bonding/bond_options.h | |
parent | fca28094cd628e187520f412caa0fb687bfbc8d4 (diff) |
bonding: options handling cleanup
Make local functions static (ie. only used in bond_options.c)
Make bond options parsing tables constant.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_options.h')
-rw-r--r-- | drivers/net/bonding/bond_options.h | 57 |
1 files changed, 7 insertions, 50 deletions
diff --git a/drivers/net/bonding/bond_options.h b/drivers/net/bonding/bond_options.h index 433d37f6940b..6c5ba0ffc31c 100644 --- a/drivers/net/bonding/bond_options.h +++ b/drivers/net/bonding/bond_options.h | |||
@@ -81,8 +81,8 @@ struct bonding; | |||
81 | 81 | ||
82 | struct bond_option { | 82 | struct bond_option { |
83 | int id; | 83 | int id; |
84 | char *name; | 84 | const char *name; |
85 | char *desc; | 85 | const char *desc; |
86 | u32 flags; | 86 | u32 flags; |
87 | 87 | ||
88 | /* unsuppmodes is used to denote modes in which the option isn't | 88 | /* unsuppmodes is used to denote modes in which the option isn't |
@@ -92,7 +92,7 @@ struct bond_option { | |||
92 | /* supported values which this option can have, can be a subset of | 92 | /* supported values which this option can have, can be a subset of |
93 | * BOND_OPTVAL_RANGE's value range | 93 | * BOND_OPTVAL_RANGE's value range |
94 | */ | 94 | */ |
95 | struct bond_opt_value *values; | 95 | const struct bond_opt_value *values; |
96 | 96 | ||
97 | int (*set)(struct bonding *bond, struct bond_opt_value *val); | 97 | int (*set)(struct bonding *bond, struct bond_opt_value *val); |
98 | }; | 98 | }; |
@@ -100,10 +100,10 @@ struct bond_option { | |||
100 | int __bond_opt_set(struct bonding *bond, unsigned int option, | 100 | int __bond_opt_set(struct bonding *bond, unsigned int option, |
101 | struct bond_opt_value *val); | 101 | struct bond_opt_value *val); |
102 | int bond_opt_tryset_rtnl(struct bonding *bond, unsigned int option, char *buf); | 102 | int bond_opt_tryset_rtnl(struct bonding *bond, unsigned int option, char *buf); |
103 | struct bond_opt_value *bond_opt_parse(const struct bond_option *opt, | 103 | const struct bond_opt_value *bond_opt_parse(const struct bond_option *opt, |
104 | struct bond_opt_value *val); | 104 | struct bond_opt_value *val); |
105 | struct bond_option *bond_opt_get(unsigned int option); | 105 | const struct bond_option *bond_opt_get(unsigned int option); |
106 | struct bond_opt_value *bond_opt_get_val(unsigned int option, u64 val); | 106 | const struct bond_opt_value *bond_opt_get_val(unsigned int option, u64 val); |
107 | 107 | ||
108 | /* This helper is used to initialize a bond_opt_value structure for parameter | 108 | /* This helper is used to initialize a bond_opt_value structure for parameter |
109 | * passing. There should be either a valid string or value, but not both. | 109 | * passing. There should be either a valid string or value, but not both. |
@@ -122,49 +122,6 @@ static inline void __bond_opt_init(struct bond_opt_value *optval, | |||
122 | #define bond_opt_initval(optval, value) __bond_opt_init(optval, NULL, value) | 122 | #define bond_opt_initval(optval, value) __bond_opt_init(optval, NULL, value) |
123 | #define bond_opt_initstr(optval, str) __bond_opt_init(optval, str, ULLONG_MAX) | 123 | #define bond_opt_initstr(optval, str) __bond_opt_init(optval, str, ULLONG_MAX) |
124 | 124 | ||
125 | int bond_option_mode_set(struct bonding *bond, struct bond_opt_value *newval); | ||
126 | int bond_option_pps_set(struct bonding *bond, struct bond_opt_value *newval); | ||
127 | int bond_option_xmit_hash_policy_set(struct bonding *bond, | ||
128 | struct bond_opt_value *newval); | ||
129 | int bond_option_arp_validate_set(struct bonding *bond, | ||
130 | struct bond_opt_value *newval); | ||
131 | int bond_option_arp_all_targets_set(struct bonding *bond, | ||
132 | struct bond_opt_value *newval); | ||
133 | int bond_option_fail_over_mac_set(struct bonding *bond, | ||
134 | struct bond_opt_value *newval); | ||
135 | int bond_option_arp_interval_set(struct bonding *bond, | ||
136 | struct bond_opt_value *newval); | ||
137 | int bond_option_arp_ip_targets_set(struct bonding *bond, | ||
138 | struct bond_opt_value *newval); | ||
139 | void bond_option_arp_ip_targets_clear(struct bonding *bond); | 125 | void bond_option_arp_ip_targets_clear(struct bonding *bond); |
140 | int bond_option_downdelay_set(struct bonding *bond, | 126 | |
141 | struct bond_opt_value *newval); | ||
142 | int bond_option_updelay_set(struct bonding *bond, | ||
143 | struct bond_opt_value *newval); | ||
144 | int bond_option_lacp_rate_set(struct bonding *bond, | ||
145 | struct bond_opt_value *newval); | ||
146 | int bond_option_min_links_set(struct bonding *bond, | ||
147 | struct bond_opt_value *newval); | ||
148 | int bond_option_ad_select_set(struct bonding *bond, | ||
149 | struct bond_opt_value *newval); | ||
150 | int bond_option_num_peer_notif_set(struct bonding *bond, | ||
151 | struct bond_opt_value *newval); | ||
152 | int bond_option_miimon_set(struct bonding *bond, struct bond_opt_value *newval); | ||
153 | int bond_option_primary_set(struct bonding *bond, | ||
154 | struct bond_opt_value *newval); | ||
155 | int bond_option_primary_reselect_set(struct bonding *bond, | ||
156 | struct bond_opt_value *newval); | ||
157 | int bond_option_use_carrier_set(struct bonding *bond, | ||
158 | struct bond_opt_value *newval); | ||
159 | int bond_option_active_slave_set(struct bonding *bond, | ||
160 | struct bond_opt_value *newval); | ||
161 | int bond_option_queue_id_set(struct bonding *bond, | ||
162 | struct bond_opt_value *newval); | ||
163 | int bond_option_all_slaves_active_set(struct bonding *bond, | ||
164 | struct bond_opt_value *newval); | ||
165 | int bond_option_resend_igmp_set(struct bonding *bond, | ||
166 | struct bond_opt_value *newval); | ||
167 | int bond_option_lp_interval_set(struct bonding *bond, | ||
168 | struct bond_opt_value *newval); | ||
169 | int bond_option_slaves_set(struct bonding *bond, struct bond_opt_value *newval); | ||
170 | #endif /* _BOND_OPTIONS_H */ | 127 | #endif /* _BOND_OPTIONS_H */ |