projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull release into acpica branch
[powerpc.git]
/
net
/
core
/
sock.c
diff --git
a/net/core/sock.c
b/net/core/sock.c
index
1c52fe8
..
13cc3be
100644
(file)
--- a/
net/core/sock.c
+++ b/
net/core/sock.c
@@
-940,7
+940,7
@@
static struct sk_buff *sock_alloc_send_pskb(struct sock *sk,
int noblock, int *errcode)
{
struct sk_buff *skb;
int noblock, int *errcode)
{
struct sk_buff *skb;
-
unsigned in
t gfp_mask;
+
gfp_
t gfp_mask;
long timeo;
int err;
long timeo;
int err;
@@
-1242,8
+1242,7
@@
static void sock_def_write_space(struct sock *sk)
static void sock_def_destruct(struct sock *sk)
{
static void sock_def_destruct(struct sock *sk)
{
- if (sk->sk_protinfo)
- kfree(sk->sk_protinfo);
+ kfree(sk->sk_protinfo);
}
void sk_send_sigurg(struct sock *sk)
}
void sk_send_sigurg(struct sock *sk)