s390/iucv: updates 2021-06-11
Subsystems (5)
cover s390/iucv: updates 2021-06-11
Hi Dave & Jakub,
please apply the following iucv patches to netdev's net-next tree.
This cleans up a pattern of forward declarations in two iucv drivers, so that they stop causing compile warnings with gcc11.
Thanks,
Julian
Heiko Carstens (1):
s390/netiuvc: get rid of forward declarations
Julian Wiedmann (1):
net/af_iucv: clean up some forward declarations
drivers/s390/net/netiucv.c | 28 ++++++++++------------------ net/iucv/af_iucv.c | 27 ++++++++++----------------- 2 files changed, 20 insertions(+), 35 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 net/af_iucv: clean up some forward declarations
The forward declarations for the iucv_handler callbacks are causing various compile warnings with gcc-11. Reshuffle the code to get rid of these prototypes.
--- net/iucv/af_iucv.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
net/iucv/af_iucv.c +10 -17
@@ -44,6 +44,7 @@ static struct proto iucv_proto = { };static struct iucv_interface *pr_iucv; +static struct iucv_handler af_iucv_handler;/* special AF_IUCV IPRM messages */ static const u8 iprm_shutdown[8] =
@@ -91,28 +92,11 @@ static void iucv_sock_close(struct sock *sk);static void afiucv_hs_callback_txnotify (struct sock *sk,enum iucv_tx_notify ); -/* Call Back functions */ -static void iucv_callback_rx (struct iucv_path *,struct iucv_message *); -static void iucv_callback_txdone (struct iucv_path *,struct iucv_message *); -static void iucv_callback_connack (struct iucv_path *,u8 *); -static int iucv_callback_connreq (struct iucv_path *,u8 *,u8 *); -static void iucv_callback_connrej (struct iucv_path *,u8 *); -static void iucv_callback_shutdown (struct iucv_path *,u8 *); -static struct iucv_sock_list iucv_sk_list = { .lock =__RW_LOCK_UNLOCKED (iucv_sk_list.lock), .autobind_name =ATOMIC_INIT (0 ) }; -static struct iucv_handler af_iucv_handler = { - .path_pending = iucv_callback_connreq, - .path_complete = iucv_callback_connack, - .path_severed = iucv_callback_connrej, - .message_pending = iucv_callback_rx, - .message_complete = iucv_callback_txdone, - .path_quiesced = iucv_callback_shutdown, -}; -static inline void high_nmcpy (unsigned char *dst,char *src) {memcpy (dst, src,8 );
@@ -1817,6 +1801,15 @@ static void iucv_callback_shutdown(struct iucv_path *path, u8 ipuser[16])bh_unlock_sock (sk); } +static struct iucv_handler af_iucv_handler = { + .path_pending = iucv_callback_connreq, + .path_complete = iucv_callback_connack, + .path_severed = iucv_callback_connrej, + .message_pending = iucv_callback_rx, + .message_complete = iucv_callback_txdone, + .path_quiesced = iucv_callback_shutdown, +}; +/***************** HiperSockets transport callbacks ********************/ static void afiucv_swap_src_dest (struct sk_buff *skb) {
Signature · 1 line
2.25.1
PATCH 2/2 s390/netiuvc: get rid of forward declarations
In reply to Julian WiedmannFrom: Heiko Carstens <[email protected]>
Move netiucv_handler to get rid of forward declarations and gcc11 compile warnings:
drivers/s390/net/netiucv.c:518:65: warning: argument 2 of type ‘u8[16]’ {aka ‘unsigned char[16]’} with mismatched bound [-Warray-parameter=]
518 | static void netiucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
| ~~~^~~~~~~~~~drivers/s390/net/netiucv.c:122:58: note: previously declared as ‘u8 *’ {aka ‘unsigned char *’}
122 | static void netiucv_callback_connack(struct iucv_path *, u8 *);
--- drivers/s390/net/netiucv.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)
drivers/s390/net/netiucv.c +10 -18
@@ -118,24 +118,6 @@ static struct device_driver netiucv_driver = { .bus = &iucv_bus, }; -static int netiucv_callback_connreq (struct iucv_path *,u8 *,u8 *); -static void netiucv_callback_connack (struct iucv_path *,u8 *); -static void netiucv_callback_connrej (struct iucv_path *,u8 *); -static void netiucv_callback_connsusp (struct iucv_path *,u8 *); -static void netiucv_callback_connres (struct iucv_path *,u8 *); -static void netiucv_callback_rx (struct iucv_path *,struct iucv_message *); -static void netiucv_callback_txdone (struct iucv_path *,struct iucv_message *); - -static struct iucv_handler netiucv_handler = { - .path_pending = netiucv_callback_connreq, - .path_complete = netiucv_callback_connack, - .path_severed = netiucv_callback_connrej, - .path_quiesced = netiucv_callback_connsusp, - .path_resumed = netiucv_callback_connres, - .message_pending = netiucv_callback_rx, - .message_complete = netiucv_callback_txdone -}; -/** * Per connection profiling data */
@@ -774,6 +756,16 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg) } } +static struct iucv_handler netiucv_handler = { + .path_pending = netiucv_callback_connreq, + .path_complete = netiucv_callback_connack, + .path_severed = netiucv_callback_connrej, + .path_quiesced = netiucv_callback_connsusp, + .path_resumed = netiucv_callback_connres, + .message_pending = netiucv_callback_rx, + .message_complete = netiucv_callback_txdone, +}; +static void conn_action_connaccept (fsm_instance *fi,int event,void *arg) {struct iucv_event *ev = arg;
Signature · 1 line
2.25.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Fri, 11 Jun 2021 09:45:00 +0200 you wrote:
Hi Dave & Jakub,
please apply the following iucv patches to netdev's net-next tree.
This cleans up a pattern of forward declarations in two iucv drivers, so that they stop causing compile warnings with gcc11.
[...]
Here is the summary with links:
- [net-next,1/2] net/af_iucv: clean up some forward declarations
https://git.kernel.org/netdev/net-next/c/87c272c618c7 - [net-next,2/2] s390/netiuvc: get rid of forward declarations https://git.kernel.org/netdev/net-next/c/fbf179683655
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html