diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:15:10 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:15:10 +0200 |
commit | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (patch) | |
tree | 9fa537a72f00f6b4f86c2da7be2e9554304a8ec4 /include/net/sock.h | |
parent | 9f75c1b12c5ef392ddcea575b13560842c28b1b3 (diff) | |
parent | edb39935c8b19fcd9a8f619d0bc1e9d04594cd2b (diff) | |
download | linux-e4caa8bab3862a7694ab7c6dfede223227ad7fc5.tar.bz2 |
Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ca241ea14875..731150d52799 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1524,20 +1524,7 @@ extern void sk_stop_timer(struct sock *sk, struct timer_list* timer); extern int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); -static inline int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb) -{ - /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces - number of warnings when compiling with -W --ANK - */ - if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= - (unsigned)sk->sk_rcvbuf) - return -ENOMEM; - skb_set_owner_r(skb, sk); - skb_queue_tail(&sk->sk_error_queue, skb); - if (!sock_flag(sk, SOCK_DEAD)) - sk->sk_data_ready(sk, skb->len); - return 0; -} +extern int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb); /* * Recover an error report and clear atomically |