Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194341
b: refs/heads/master
c: 90b3e03
h: refs/heads/master
i:
  194339: 385097c
v: v3
  • Loading branch information
andrew hendry authored and David S. Miller committed Apr 22, 2010
1 parent 7437398 commit 883cc92
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: 5d74731437b8c8914d2d2956c497c66af3bd6a52
refs/heads/master: 90b3e030370dba721e141e85661881f5e342e1ab
12 changes: 6 additions & 6 deletions trunk/drivers/net/wan/hdlc_x25.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code)

static void x25_connected(struct net_device *dev, int reason)
{
x25_connect_disconnect(dev, reason, 1);
x25_connect_disconnect(dev, reason, X25_IFACE_CONNECT);
}



static void x25_disconnected(struct net_device *dev, int reason)
{
x25_connect_disconnect(dev, reason, 2);
x25_connect_disconnect(dev, reason, X25_IFACE_DISCONNECT);
}


Expand All @@ -71,7 +71,7 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
return NET_RX_DROP;

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

skb->protocol = x25_type_trans(skb, dev);
return netif_rx(skb);
Expand All @@ -94,13 +94,13 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)

/* X.25 to LAPB */
switch (skb->data[0]) {
case 0: /* Data to be transmitted */
case X25_IFACE_DATA: /* Data to be transmitted */
skb_pull(skb, 1);
if ((result = lapb_data_request(dev, skb)) != LAPB_OK)
dev_kfree_skb(skb);
return NETDEV_TX_OK;

case 1:
case X25_IFACE_CONNECT:
if ((result = lapb_connect_request(dev))!= LAPB_OK) {
if (result == LAPB_CONNECTED)
/* Send connect confirm. msg to level 3 */
Expand All @@ -112,7 +112,7 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
}
break;

case 2:
case X25_IFACE_DISCONNECT:
if ((result = lapb_disconnect_request(dev)) != LAPB_OK) {
if (result == LAPB_NOTCONNECTED)
/* Send disconnect confirm. msg to level 3 */
Expand Down

0 comments on commit 883cc92

Please sign in to comment.