Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a19a56 authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller
Browse files

[DECNET]: fix sparse gfp nocast warnings 



Fix implicit nocast warnings in decnet code:
net/decnet/af_decnet.c:458:40: warning: implicit cast to nocast type
net/decnet/dn_nsp_out.c:125:35: warning: implicit cast to nocast type
net/decnet/dn_nsp_out.c:219:29: warning: implicit cast to nocast type

Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17b69885

include/net/dn_nsp.h

+4 −4
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ extern void dn_nsp_send_data_ack(struct sock *sk); 
extern void dn_nsp_send_oth_ack(struct sock *sk);

extern void dn_nsp_delayed_ack(struct sock *sk);

extern void dn_send_conn_ack(struct sock *sk);

extern void dn_send_conn_conf(struct sock *sk, int gfp);

extern void dn_send_conn_conf(struct sock *sk, unsigned int __nocast gfp);

extern void dn_nsp_send_disc(struct sock *sk, unsigned char type, 

				unsigned short reason, int gfp);

			unsigned short reason, unsigned int __nocast gfp);

extern void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type,

				unsigned short reason);

extern void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval);
@@ -29,14 +29,14 @@ extern void dn_nsp_send_conninit(struct sock *sk, unsigned char flags); 


extern void dn_nsp_output(struct sock *sk);

extern int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff_head *q, unsigned short acknum);

extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, int gfp, int oob);

extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, unsigned int __nocast gfp, int oob);

extern unsigned long dn_nsp_persist(struct sock *sk);

extern int dn_nsp_xmit_timeout(struct sock *sk);



extern int dn_nsp_rx(struct sk_buff *);

extern int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb);



extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri);

extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, unsigned int __nocast pri);

extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, long timeo, int *err);



#define NSP_REASON_OK 0		/* No error */

include/net/dn_route.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    GNU General Public License for more details.

*******************************************************************************/



extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri);

extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, unsigned int __nocast pri);

extern int dn_route_output_sock(struct dst_entry **pprt, struct flowi *, struct sock *sk, int flags);

extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);

extern int dn_cache_getroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);

net/decnet/af_decnet.c

+4 −2
Original line number Diff line number Diff line
@@ -452,7 +452,8 @@ static struct proto dn_proto = { 
	.obj_size = sizeof(struct dn_sock),

};



static struct sock *dn_alloc_sock(struct socket *sock, int gfp)

static struct sock *dn_alloc_sock(struct socket *sock,

				  unsigned int __nocast gfp)

{

	struct dn_scp *scp;

	struct sock *sk = sk_alloc(PF_DECnet, gfp, &dn_proto, 1);
@@ -804,7 +805,8 @@ static int dn_auto_bind(struct socket *sock) 
	return rv;

}



static int dn_confirm_accept(struct sock *sk, long *timeo, int allocation)

static int dn_confirm_accept(struct sock *sk, long *timeo,

				unsigned int __nocast allocation)

{

	struct dn_scp *scp = DN_SK(sk);

	DEFINE_WAIT(wait);

net/decnet/dn_nsp_out.c

+14 −9
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static void dn_nsp_send(struct sk_buff *skb) 
 * The eventual aim is for each socket to have a cached header size

 * for its outgoing packets, and to set hdr from this when sk != NULL.

 */

struct sk_buff *dn_alloc_skb(struct sock *sk, int size, int pri)

struct sk_buff *dn_alloc_skb(struct sock *sk, int size,

			     unsigned int __nocast pri)

{

	struct sk_buff *skb;

	int hdr = 64;
@@ -210,7 +211,8 @@ static void dn_nsp_rtt(struct sock *sk, long rtt) 
 *

 * Returns: The number of times the packet has been sent previously

 */

static inline unsigned dn_nsp_clone_and_send(struct sk_buff *skb, int gfp)

static inline unsigned dn_nsp_clone_and_send(struct sk_buff *skb,

					     unsigned int __nocast gfp)

{

	struct dn_skb_cb *cb = DN_SKB_CB(skb);

	struct sk_buff *skb2;
@@ -350,7 +352,8 @@ static unsigned short *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *sk 
	return ptr;

}



void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, int gfp, int oth)

void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb,

			unsigned int __nocast gfp, int oth)

{

	struct dn_scp *scp = DN_SK(sk);

	struct dn_skb_cb *cb = DN_SKB_CB(skb);
@@ -517,7 +520,7 @@ static int dn_nsp_retrans_conn_conf(struct sock *sk) 
	return 0;

}



void dn_send_conn_conf(struct sock *sk, int gfp)

void dn_send_conn_conf(struct sock *sk, unsigned int __nocast gfp)

{

	struct dn_scp *scp = DN_SK(sk);

	struct sk_buff *skb = NULL;
@@ -549,7 +552,8 @@ void dn_send_conn_conf(struct sock *sk, int gfp) 




static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, 

			unsigned short reason, int gfp, struct dst_entry *dst,

			unsigned short reason, unsigned int __nocast gfp,

			struct dst_entry *dst,

			int ddl, unsigned char *dd, __u16 rem, __u16 loc)

{

	struct sk_buff *skb = NULL;
@@ -591,7 +595,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, 




void dn_nsp_send_disc(struct sock *sk, unsigned char msgflg, 

			unsigned short reason, int gfp)

			unsigned short reason, unsigned int __nocast gfp)

{

	struct dn_scp *scp = DN_SK(sk);

	int ddl = 0;
@@ -612,7 +616,7 @@ void dn_nsp_return_disc(struct sk_buff *skb, unsigned char msgflg, 
{

	struct dn_skb_cb *cb = DN_SKB_CB(skb);

	int ddl = 0;

	int gfp = GFP_ATOMIC;

	unsigned int __nocast gfp = GFP_ATOMIC;



	dn_nsp_do_disc(NULL, msgflg, reason, gfp, skb->dst, ddl, 

			NULL, cb->src_port, cb->dst_port);
@@ -624,7 +628,7 @@ void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval) 
	struct dn_scp *scp = DN_SK(sk);

	struct sk_buff *skb;

	unsigned char *ptr;

	int gfp = GFP_ATOMIC;

	unsigned int __nocast gfp = GFP_ATOMIC;



	if ((skb = dn_alloc_skb(sk, DN_MAX_NSP_DATA_HEADER + 2, gfp)) == NULL)

		return;
@@ -659,7 +663,8 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg) 
	unsigned char menuver;

	struct dn_skb_cb *cb;

	unsigned char type = 1;

	int allocation = (msgflg == NSP_CI) ? sk->sk_allocation : GFP_ATOMIC;

	unsigned int __nocast allocation =

			(msgflg == NSP_CI) ? sk->sk_allocation : GFP_ATOMIC;

	struct sk_buff *skb = dn_alloc_skb(sk, 200, allocation);



	if (!skb)