diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-15 20:02:24 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-15 20:02:24 (GMT) |
| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch) | |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 /net/atm/raw.c | |
| parent | 21f9fcd81593e201172160853b8647336fb81f4f (diff) | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| download | linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.xz | |
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
Diffstat (limited to 'net/atm/raw.c')
| -rw-r--r-- | net/atm/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/raw.c b/net/atm/raw.c index b4f7b9f..2e17e97 100644 --- a/net/atm/raw.c +++ b/net/atm/raw.c @@ -25,7 +25,7 @@ static void atm_push_raw(struct atm_vcc *vcc, struct sk_buff *skb) struct sock *sk = sk_atm(vcc); skb_queue_tail(&sk->sk_receive_queue, skb); - sk->sk_data_ready(sk, skb->len); + sk->sk_data_ready(sk); } } |