bridge: update sysfs link names if port device names have changed

[safe/jmp/linux-2.6] / net / atm / raw.c

diff --git a/net/atm/raw.c b/net/atm/raw.c
index b0a2d8c..b4f7b9f 100644 (file)
--- a/net/atm/raw.c
+++ b/net/atm/raw.c
@@ -2,6 +2,7 @@
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
 
 #include <linux/module.h>
 #include <linux/atmdev.h>
@@ -9,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 
 #include "common.h"
 #include "protocols.h"
@@ -17,7 +19,7 @@
  * SKB == NULL indicates that the link is being closed
  */
 
-static void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb)
+static void atm_push_raw(struct atm_vcc *vcc, struct sk_buff *skb)
 {
        if (skb) {
                struct sock *sk = sk_atm(vcc);
@@ -27,36 +29,33 @@ static void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb)
        }
 }
 
-
-static void atm_pop_raw(struct atm_vcc *vcc,struct sk_buff *skb)
+static void atm_pop_raw(struct atm_vcc *vcc, struct sk_buff *skb)
 {
        struct sock *sk = sk_atm(vcc);
 
-       pr_debug("APopR (%d) %d -= %d\n", vcc->vci,
-               atomic_read(&sk->sk_wmem_alloc), skb->truesize);
+       pr_debug("(%d) %d -= %d\n",
+                vcc->vci, sk_wmem_alloc_get(sk), skb->truesize);
        atomic_sub(skb->truesize, &sk->sk_wmem_alloc);
        dev_kfree_skb_any(skb);
        sk->sk_write_space(sk);
 }
 
-
-static int atm_send_aal0(struct atm_vcc *vcc,struct sk_buff *skb)
+static int atm_send_aal0(struct atm_vcc *vcc, struct sk_buff *skb)
 {
        /*
         * Note that if vpi/vci are _ANY or _UNSPEC the below will
         * still work
         */
        if (!capable(CAP_NET_ADMIN) &&
-           (((u32 *) skb->data)[0] & (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)) !=
-           ((vcc->vpi << ATM_HDR_VPI_SHIFT) | (vcc->vci << ATM_HDR_VCI_SHIFT)))
-           {
+           (((u32 *)skb->data)[0] & (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)) !=
+           ((vcc->vpi << ATM_HDR_VPI_SHIFT) |
+            (vcc->vci << ATM_HDR_VCI_SHIFT))) {
                kfree_skb(skb);
                return -EADDRNOTAVAIL;
        }
-       return vcc->dev->ops->send(vcc,skb);
+       return vcc->dev->ops->send(vcc, skb);
 }
 
-
 int atm_init_aal0(struct atm_vcc *vcc)
 {
        vcc->push = atm_push_raw;
@@ -66,7 +65,6 @@ int atm_init_aal0(struct atm_vcc *vcc)
        return 0;
 }
 
-
 int atm_init_aal34(struct atm_vcc *vcc)
 {
        vcc->push = atm_push_raw;
@@ -76,7 +74,6 @@ int atm_init_aal34(struct atm_vcc *vcc)
        return 0;
 }
 
-
 int atm_init_aal5(struct atm_vcc *vcc)
 {
        vcc->push = atm_push_raw;
@@ -85,6 +82,4 @@ int atm_init_aal5(struct atm_vcc *vcc)
        vcc->send = vcc->dev->ops->send;
        return 0;
 }
-
-
 EXPORT_SYMBOL(atm_init_aal5);