Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256018
b: refs/heads/master
c: fcb261f
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Jul 1, 2011
1 parent 6dad73c commit e3ea5c2
Show file tree
Hide file tree
Showing 3 changed files with 445 additions and 468 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: 207ec0abbed50b43a44cb7c69a07aeee08da5e45
refs/heads/master: fcb261f35714fdf3d5c37d714e55b507b8cd55bc
30 changes: 15 additions & 15 deletions trunk/net/lapb/lapb_iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,26 +300,26 @@ int lapb_disconnect_request(struct net_device *dev)
goto out;

switch (lapb->state) {
case LAPB_STATE_0:
rc = LAPB_NOTCONNECTED;
goto out_put;
case LAPB_STATE_0:
rc = LAPB_NOTCONNECTED;
goto out_put;

case LAPB_STATE_1:
case LAPB_STATE_1:
#if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
#endif
#if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb);
rc = LAPB_NOTCONNECTED;
goto out_put;

case LAPB_STATE_2:
rc = LAPB_OK;
goto out_put;
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
lapb->state = LAPB_STATE_0;
lapb_start_t1timer(lapb);
rc = LAPB_NOTCONNECTED;
goto out_put;

case LAPB_STATE_2:
rc = LAPB_OK;
goto out_put;
}

lapb_clear_queues(lapb);
Expand Down
Loading

0 comments on commit e3ea5c2

Please sign in to comment.