projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release' and 'ppc-workaround' into release
[cascardo/linux.git]
/
net
/
atm
/
raw.c
diff --git
a/net/atm/raw.c
b/net/atm/raw.c
index
4df7cdd
..
b0a2d8c
100644
(file)
--- a/
net/atm/raw.c
+++ b/
net/atm/raw.c
@@
-4,7
+4,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/atmdev.h>
#include <linux/capability.h>
#include <linux/kernel.h>
#include <linux/atmdev.h>
#include <linux/capability.h>
#include <linux/kernel.h>
@@
-14,14
+13,6
@@
#include "common.h"
#include "protocols.h"
#include "common.h"
#include "protocols.h"
-
-#if 0
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-
-
/*
* SKB == NULL indicates that the link is being closed
*/
/*
* SKB == NULL indicates that the link is being closed
*/
@@
-41,8
+32,8
@@
static void atm_pop_raw(struct atm_vcc *vcc,struct sk_buff *skb)
{
struct sock *sk = sk_atm(vcc);
{
struct sock *sk = sk_atm(vcc);
-
DPRINTK("APopR (%d) %d -= %d\n", vcc->vci, sk->sk_wmem_alloc
,
- skb->truesize);
+
pr_debug("APopR (%d) %d -= %d\n", vcc->vci
,
+
atomic_read(&sk->sk_wmem_alloc),
skb->truesize);
atomic_sub(skb->truesize, &sk->sk_wmem_alloc);
dev_kfree_skb_any(skb);
sk->sk_write_space(sk);
atomic_sub(skb->truesize, &sk->sk_wmem_alloc);
dev_kfree_skb_any(skb);
sk->sk_write_space(sk);