|
@@ -18,7 +18,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);
|
|
@@ -28,8 +28,7 @@ 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);
|
|
|
|
|
@@ -40,24 +39,22 @@ static void atm_pop_raw(struct atm_vcc *vcc,struct sk_buff *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;
|
|
@@ -67,7 +64,6 @@ int atm_init_aal0(struct atm_vcc *vcc)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
int atm_init_aal34(struct atm_vcc *vcc)
|
|
|
{
|
|
|
vcc->push = atm_push_raw;
|
|
@@ -77,7 +73,6 @@ int atm_init_aal34(struct atm_vcc *vcc)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
int atm_init_aal5(struct atm_vcc *vcc)
|
|
|
{
|
|
|
vcc->push = atm_push_raw;
|
|
@@ -86,6 +81,4 @@ int atm_init_aal5(struct atm_vcc *vcc)
|
|
|
vcc->send = vcc->dev->ops->send;
|
|
|
return 0;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
EXPORT_SYMBOL(atm_init_aal5);
|