Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194339
b: refs/heads/master
c: 4d99503
h: refs/heads/master
i:
  194337: ff00ff3
  194335: f59df14
v: v3
  • Loading branch information
andrew hendry authored and David S. Miller committed Apr 22, 2010
1 parent feeb197 commit 385097c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7eeeacf0b5b8c0a0badced506388c02b9422d508
refs/heads/master: 4d99503e0b28edf654ca1918229a317a3f738f08
12 changes: 6 additions & 6 deletions trunk/drivers/net/wan/lapbether.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
return NET_RX_DROP;

ptr = skb->data;
*ptr = 0x00;
*ptr = X25_IFACE_DATA;

skb->protocol = x25_type_trans(skb, dev);
return netif_rx(skb);
Expand All @@ -161,14 +161,14 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
goto drop;

switch (skb->data[0]) {
case 0x00:
case X25_IFACE_DATA:
break;
case 0x01:
case X25_IFACE_CONNECT:
if ((err = lapb_connect_request(dev)) != LAPB_OK)
printk(KERN_ERR "lapbeth: lapb_connect_request "
"error: %d\n", err);
goto drop;
case 0x02:
case X25_IFACE_DISCONNECT:
if ((err = lapb_disconnect_request(dev)) != LAPB_OK)
printk(KERN_ERR "lapbeth: lapb_disconnect_request "
"err: %d\n", err);
Expand Down Expand Up @@ -225,7 +225,7 @@ static void lapbeth_connected(struct net_device *dev, int reason)
}

ptr = skb_put(skb, 1);
*ptr = 0x01;
*ptr = X25_IFACE_CONNECT;

skb->protocol = x25_type_trans(skb, dev);
netif_rx(skb);
Expand All @@ -242,7 +242,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
}

ptr = skb_put(skb, 1);
*ptr = 0x02;
*ptr = X25_IFACE_DISCONNECT;

skb->protocol = x25_type_trans(skb, dev);
netif_rx(skb);
Expand Down

0 comments on commit 385097c

Please sign in to comment.