diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2013-12-30 15:37:29 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2014-09-28 10:05:16 -0400 |
| commit | 7bced397510ab569d31de4c70b39e13355046387 (patch) | |
| tree | faa4067a53e42acffc752e9a153e7dbaed4126e5 /net/llc | |
| parent | 08223d80df38e666a42d7c82eb340db55c6e03bd (diff) | |
net_dma: simple removal
Per commit "77873803363c net_dma: mark broken" net_dma is no longer used
and there is no plan to fix it.
This is the mechanical removal of bits in CONFIG_NET_DMA ifdef guards.
Reverting the remainder of the net_dma induced changes is deferred to
subsequent patches.
Marked for stable due to Roman's report of a memory leak in
dma_pin_iovec_pages():
https://lkml.org/lkml/2014/9/3/177
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: David Whipple <whipple@securedatainnovations.ch>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: <stable@vger.kernel.org>
Reported-by: Roman Gushchin <klamm@yandex-team.ru>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/af_llc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 0080d2b0a8ae..bb9cbc17d926 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
| @@ -839,7 +839,7 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 839 | 839 | ||
| 840 | if (!(flags & MSG_PEEK)) { | 840 | if (!(flags & MSG_PEEK)) { |
| 841 | spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); | 841 | spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); |
| 842 | sk_eat_skb(sk, skb, false); | 842 | sk_eat_skb(sk, skb); |
| 843 | spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); | 843 | spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); |
| 844 | *seq = 0; | 844 | *seq = 0; |
| 845 | } | 845 | } |
| @@ -861,10 +861,10 @@ copy_uaddr: | |||
| 861 | llc_cmsg_rcv(msg, skb); | 861 | llc_cmsg_rcv(msg, skb); |
| 862 | 862 | ||
| 863 | if (!(flags & MSG_PEEK)) { | 863 | if (!(flags & MSG_PEEK)) { |
| 864 | spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); | 864 | spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); |
| 865 | sk_eat_skb(sk, skb, false); | 865 | sk_eat_skb(sk, skb); |
| 866 | spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); | 866 | spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); |
| 867 | *seq = 0; | 867 | *seq = 0; |
| 868 | } | 868 | } |
| 869 | 869 | ||
| 870 | goto out; | 870 | goto out; |