Commit 7d877f3b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: net/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fd4f2df2

include/linux/security.h

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ struct security_operations { 
	int (*socket_shutdown) (struct socket * sock, int how);

	int (*socket_sock_rcv_skb) (struct sock * sk, struct sk_buff * skb);

	int (*socket_getpeersec) (struct socket *sock, char __user *optval, int __user *optlen, unsigned len);

	int (*sk_alloc_security) (struct sock *sk, int family, int priority);

	int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);

	void (*sk_free_security) (struct sock *sk);

#endif	/* CONFIG_SECURITY_NETWORK */

};

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct sock { 
	struct sk_buff_head	sk_write_queue;

	int			sk_wmem_queued;

	int			sk_forward_alloc;

	unsigned int		sk_allocation;

	gfp_t			sk_allocation;

	int			sk_sndbuf;

	int			sk_route_caps;

	unsigned long 		sk_flags;

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static struct sk_buff *sock_alloc_send_pskb(struct sock *sk, 
					    int noblock, int *errcode)

{

	struct sk_buff *skb;

	unsigned int gfp_mask;

	gfp_t gfp_mask;

	long timeo;

	int err;

net/dccp/output.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ void dccp_send_close(struct sock *sk, const int active) 
{

	struct dccp_sock *dp = dccp_sk(sk);

	struct sk_buff *skb;

	const unsigned int prio = active ? GFP_KERNEL : GFP_ATOMIC;

	const gfp_t prio = active ? GFP_KERNEL : GFP_ATOMIC;



	skb = alloc_skb(sk->sk_prot->max_header, prio);

	if (skb == NULL)

net/netlink/af_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ struct netlink_broadcast_data { 
	int failure;

	int congested;

	int delivered;

	unsigned int allocation;

	gfp_t allocation;

	struct sk_buff *skb, *skb2;

};