Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e6a04b1d3ff9d5af219b2fcaebe0ef04733d597c

Authored by Ying Xue
Committed by David S. Miller
1 parent 34f256cc79

tipc: eliminate configuration for maximum number of name publications 

Gets rid of the need for users to specify the maximum number of
name publications supported by TIPC. TIPC now automatically provides
support for the maximum number of name publications to 65535.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 7 additions and 28 deletions Side-by-side Diff

include/linux/tipc_config.h
Diff comments   View file @ e6a04b1
... ... @@ -89,7 +89,7 @@
89 89  
90 90 #define TIPC_CMD_GET_REMOTE_MNG 0x4003 /* tx none, rx unsigned */
91 91 #define TIPC_CMD_GET_MAX_PORTS 0x4004 /* tx none, rx unsigned */
92   -#define TIPC_CMD_GET_MAX_PUBL 0x4005 /* tx none, rx unsigned */
  92 +#define TIPC_CMD_GET_MAX_PUBL 0x4005 /* obsoleted */
93 93 #define TIPC_CMD_GET_MAX_SUBSCR 0x4006 /* obsoleted */
94 94 #define TIPC_CMD_GET_MAX_ZONES 0x4007 /* obsoleted */
95 95 #define TIPC_CMD_GET_MAX_CLUSTERS 0x4008 /* obsoleted */
... ... @@ -115,7 +115,7 @@
115 115 #define TIPC_CMD_SET_NODE_ADDR 0x8001 /* tx net_addr, rx none */
116 116 #define TIPC_CMD_SET_REMOTE_MNG 0x8003 /* tx unsigned, rx none */
117 117 #define TIPC_CMD_SET_MAX_PORTS 0x8004 /* tx unsigned, rx none */
118   -#define TIPC_CMD_SET_MAX_PUBL 0x8005 /* tx unsigned, rx none */
  118 +#define TIPC_CMD_SET_MAX_PUBL 0x8005 /* obsoleted */
119 119 #define TIPC_CMD_SET_MAX_SUBSCR 0x8006 /* obsoleted */
120 120 #define TIPC_CMD_SET_MAX_ZONES 0x8007 /* obsoleted */
121 121 #define TIPC_CMD_SET_MAX_CLUSTERS 0x8008 /* obsoleted */
... ... @@ -208,21 +208,6 @@
208 208 return tipc_cfg_reply_none();
209 209 }
210 210  
211   -static struct sk_buff *cfg_set_max_publications(void)
212   -{
213   - u32 value;
214   -
215   - if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
216   - return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
217   -
218   - value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
219   - if (value < 1 || value > 65535)
220   - return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
221   - " (max publications must be 1-65535)");
222   - tipc_max_publications = value;
223   - return tipc_cfg_reply_none();
224   -}
225   -
226 211 static struct sk_buff *cfg_set_max_ports(void)
227 212 {
228 213 u32 value;
... ... @@ -342,9 +327,6 @@
342 327 case TIPC_CMD_SET_MAX_PORTS:
343 328 rep_tlv_buf = cfg_set_max_ports();
344 329 break;
345   - case TIPC_CMD_SET_MAX_PUBL:
346   - rep_tlv_buf = cfg_set_max_publications();
347   - break;
348 330 case TIPC_CMD_SET_NETID:
349 331 rep_tlv_buf = cfg_set_netid();
350 332 break;
... ... @@ -354,9 +336,6 @@
354 336 case TIPC_CMD_GET_MAX_PORTS:
355 337 rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_max_ports);
356 338 break;
357   - case TIPC_CMD_GET_MAX_PUBL:
358   - rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_max_publications);
359   - break;
360 339 case TIPC_CMD_GET_NETID:
361 340 rep_tlv_buf = tipc_cfg_reply_unsigned(tipc_net_id);
362 341 break;
... ... @@ -374,6 +353,8 @@
374 353 case TIPC_CMD_GET_MAX_NODES:
375 354 case TIPC_CMD_SET_MAX_SUBSCR:
376 355 case TIPC_CMD_GET_MAX_SUBSCR:
  356 + case TIPC_CMD_SET_MAX_PUBL:
  357 + case TIPC_CMD_GET_MAX_PUBL:
377 358 case TIPC_CMD_SET_LOG_SIZE:
378 359 case TIPC_CMD_DUMP_LOG:
379 360 rep_tlv_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
... ... @@ -53,7 +53,6 @@
53 53 /* configurable TIPC parameters */
54 54 u32 tipc_own_addr __read_mostly;
55 55 int tipc_max_ports __read_mostly;
56   -int tipc_max_publications;
57 56 int tipc_net_id __read_mostly;
58 57 int tipc_remote_management __read_mostly;
59 58  
... ... @@ -155,7 +154,6 @@
155 154  
156 155 tipc_own_addr = 0;
157 156 tipc_remote_management = 1;
158   - tipc_max_publications = 10000;
159 157 tipc_max_ports = CONFIG_TIPC_PORTS;
160 158 tipc_net_id = 4711;
161 159  
... ... @@ -62,6 +62,7 @@
62 62  
63 63 #define ULTRA_STRING_MAX_LEN 32768
64 64 #define TIPC_MAX_SUBSCRIPTIONS 65535
  65 +#define TIPC_MAX_PUBLICATIONS 65535
65 66  
66 67 struct tipc_msg; /* msg.h */
67 68  
... ... @@ -77,7 +78,6 @@
77 78 */
78 79 extern u32 tipc_own_addr __read_mostly;
79 80 extern int tipc_max_ports __read_mostly;
80   -extern int tipc_max_publications;
81 81 extern int tipc_net_id __read_mostly;
82 82 extern int tipc_remote_management __read_mostly;
83 83  
net/tipc/name_table.c
Diff comments   View file @ e6a04b1
... ... @@ -667,9 +667,9 @@
667 667 {
668 668 struct publication *publ;
669 669  
670   - if (table.local_publ_count >= tipc_max_publications) {
  670 + if (table.local_publ_count >= TIPC_MAX_PUBLICATIONS) {
671 671 pr_warn("Publication failed, local publication limit reached (%u)\n",
672   - tipc_max_publications);
  672 + TIPC_MAX_PUBLICATIONS);
673 673 return NULL;
674 674 }
675 675