Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8c8696553aa3895c2ad4289537e4af45a8877b62

Authored by Allan Stephens
Committed by David S. Miller
1 parent f59d43899e
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[TIPC]: Removal of message header option code 

This patch removes code associated with optional, user-specified
fields of the TIPC message header.  Such fields were never
utilized by TIPC, and have now been removed from the protocol
specification.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 4 changed files with 0 additions and 38 deletions Side-by-side Diff

include/net/tipc/tipc_port.h
Diff comments   View file @ 8c86965
... ... @@ -86,13 +86,6 @@
86 86 void (*wakeup)(struct tipc_port *),
87 87 const u32 importance);
88 88  
89   -/*
90   - * tipc_set_msg_option(): port must be locked.
91   - */
92   -int tipc_set_msg_option(struct tipc_port *tp_ptr,
93   - const char *opt,
94   - const u32 len);
95   -
96 89 int tipc_reject_msg(struct sk_buff *buf, u32 err);
97 90  
98 91 int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode);
... ... @@ -277,7 +277,6 @@
277 277 /* TIPC API for external APIs (see tipc_port.h) */
278 278  
279 279 EXPORT_SYMBOL(tipc_createport_raw);
280   -EXPORT_SYMBOL(tipc_set_msg_option);
281 280 EXPORT_SYMBOL(tipc_reject_msg);
282 281 EXPORT_SYMBOL(tipc_send_buf_fast);
283 282 EXPORT_SYMBOL(tipc_acknowledge);
... ... @@ -190,18 +190,6 @@
190 190 msg_set_bits(m, 1, 19, 0x3, n);
191 191 }
192 192  
193   -static inline void msg_set_options(struct tipc_msg *m, const char *opt, u32 sz)
194   -{
195   - u32 hsz = msg_hdr_sz(m);
196   - char *to = (char *)&m->hdr[hsz/4];
197   -
198   - if ((hsz < DIR_MSG_H_SIZE) || ((hsz + sz) > MAX_H_SIZE))
199   - return;
200   - msg_set_bits(m, 1, 16, 0x7, (hsz - 28)/4);
201   - msg_set_hdr_sz(m, hsz + sz);
202   - memcpy(to, opt, sz);
203   -}
204   -
205 193 static inline u32 msg_bcast_ack(struct tipc_msg *m)
206 194 {
207 195 return msg_bits(m, 1, 0, 0xffff);
... ... @@ -329,17 +317,6 @@
329 317 {
330 318 return (struct tipc_msg *)msg_data(m);
331 319 }
332   -
333   -static inline void msg_expand(struct tipc_msg *m, u32 destnode)
334   -{
335   - if (!msg_short(m))
336   - return;
337   - msg_set_hdr_sz(m, LONG_H_SIZE);
338   - msg_set_orignode(m, msg_prevnode(m));
339   - msg_set_destnode(m, destnode);
340   - memset(&m->hdr[8], 0, 12);
341   -}
342   -
343 320  
344 321  
345 322 /*
... ... @@ -413,13 +413,6 @@
413 413 return buf;
414 414 }
415 415  
416   -int tipc_set_msg_option(struct tipc_port *tp_ptr, const char *opt, const u32 sz)
417   -{
418   - msg_expand(&tp_ptr->phdr, msg_destnode(&tp_ptr->phdr));
419   - msg_set_options(&tp_ptr->phdr, opt, sz);
420   - return TIPC_OK;
421   -}
422   -
423 416 int tipc_reject_msg(struct sk_buff *buf, u32 err)
424 417 {
425 418 struct tipc_msg *msg = buf_msg(buf);