mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
X25: Use identifiers for isdn device to x25 interface
Change magic numbers to identifiers for X25 interface. also minor check patch formatting. Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Acked-by: Karsten Keil <isdn@linux-pingi.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5ebfbc06aa
commit
4150bbf338
1 changed files with 9 additions and 8 deletions
|
@ -194,7 +194,7 @@ static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb
|
|||
if ( ( (ix25_pdata_t*) (cprot->proto_data) )
|
||||
-> state == WAN_CONNECTED ){
|
||||
if( skb_push(skb, 1)){
|
||||
skb -> data[0]=0x00;
|
||||
skb->data[0] = X25_IFACE_DATA;
|
||||
skb->protocol = x25_type_trans(skb, cprot->net_dev);
|
||||
netif_rx(skb);
|
||||
return 0;
|
||||
|
@ -224,7 +224,7 @@ static int isdn_x25iface_connect_ind(struct concap_proto *cprot)
|
|||
|
||||
skb = dev_alloc_skb(1);
|
||||
if( skb ){
|
||||
*( skb_put(skb, 1) ) = 0x01;
|
||||
*(skb_put(skb, 1)) = X25_IFACE_CONNECT;
|
||||
skb->protocol = x25_type_trans(skb, cprot->net_dev);
|
||||
netif_rx(skb);
|
||||
return 0;
|
||||
|
@ -253,7 +253,7 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
|
|||
*state_p = WAN_DISCONNECTED;
|
||||
skb = dev_alloc_skb(1);
|
||||
if( skb ){
|
||||
*( skb_put(skb, 1) ) = 0x02;
|
||||
*(skb_put(skb, 1)) = X25_IFACE_DISCONNECT;
|
||||
skb->protocol = x25_type_trans(skb, cprot->net_dev);
|
||||
netif_rx(skb);
|
||||
return 0;
|
||||
|
@ -272,9 +272,10 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
|
|||
unsigned char firstbyte = skb->data[0];
|
||||
enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state;
|
||||
int ret = 0;
|
||||
IX25DEBUG( "isdn_x25iface_xmit: %s first=%x state=%d \n", MY_DEVNAME(cprot -> net_dev), firstbyte, *state );
|
||||
IX25DEBUG("isdn_x25iface_xmit: %s first=%x state=%d\n",
|
||||
MY_DEVNAME(cprot->net_dev), firstbyte, *state);
|
||||
switch ( firstbyte ){
|
||||
case 0x00: /* dl_data request */
|
||||
case X25_IFACE_DATA:
|
||||
if( *state == WAN_CONNECTED ){
|
||||
skb_pull(skb, 1);
|
||||
cprot -> net_dev -> trans_start = jiffies;
|
||||
|
@ -285,7 +286,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
|
|||
}
|
||||
illegal_state_warn( *state, firstbyte );
|
||||
break;
|
||||
case 0x01: /* dl_connect request */
|
||||
case X25_IFACE_CONNECT:
|
||||
if( *state == WAN_DISCONNECTED ){
|
||||
*state = WAN_CONNECTING;
|
||||
ret = cprot -> dops -> connect_req(cprot);
|
||||
|
@ -298,7 +299,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
|
|||
illegal_state_warn( *state, firstbyte );
|
||||
}
|
||||
break;
|
||||
case 0x02: /* dl_disconnect request */
|
||||
case X25_IFACE_DISCONNECT:
|
||||
switch ( *state ){
|
||||
case WAN_DISCONNECTED:
|
||||
/* Should not happen. However, give upper layer a
|
||||
|
@ -318,7 +319,7 @@ static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb)
|
|||
illegal_state_warn( *state, firstbyte );
|
||||
}
|
||||
break;
|
||||
case 0x03: /* changing lapb parameters requested */
|
||||
case X25_IFACE_PARAMS:
|
||||
printk(KERN_WARNING "isdn_x25iface_xmit: setting of lapb"
|
||||
" options not yet supported\n");
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue