Skip to content

L
linux
Commit b200a2aa authored by Alexander Viro's avatar Alexander Viro Committed by Stephen Hemminger
Browse files
Options

[wan lapb] Printks switched from %p lapb->token to %p lapb->dev.

parent a01d4ab4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 84 deletions
net/lapb/lapb_iface.c
View file @ b200a2aa
...@@ -280,7 +280,7 @@ int lapb_connect_request(struct net_device *dev) ...@@ -280,7 +280,7 @@ int lapb_connect_request(struct net_device *dev)
lapb_establish_data_link(lapb); lapb_establish_data_link(lapb);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S0 -> S1\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S0 -> S1\n", lapb->dev);
#endif #endif
lapb->state = LAPB_STATE_1; lapb->state = LAPB_STATE_1;
...@@ -306,10 +306,10 @@ int lapb_disconnect_request(struct net_device *dev) ...@@ -306,10 +306,10 @@ int lapb_disconnect_request(struct net_device *dev)
case LAPB_STATE_1: case LAPB_STATE_1:
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S1 TX DISC(1)\n", lapb->dev);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
...@@ -330,10 +330,10 @@ int lapb_disconnect_request(struct net_device *dev) ...@@ -330,10 +330,10 @@ int lapb_disconnect_request(struct net_device *dev)
lapb->state = LAPB_STATE_2; lapb->state = LAPB_STATE_2;
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S3 DISC(1)\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S3 DISC(1)\n", lapb->dev);
#endif #endif
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S2\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S3 -> S2\n", lapb->dev);
#endif #endif
rc = LAPB_OK; rc = LAPB_OK;
......
net/lapb/lapb_in.c
View file @ b200a2aa
This diff is collapsed.
net/lapb/lapb_out.c
View file @ b200a2aa
...@@ -63,7 +63,7 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll ...@@ -63,7 +63,7 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n", printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n",
lapb->token, lapb->state, poll_bit, lapb->vs, lapb->vr); lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr);
#endif #endif
lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); lapb_transmit_buffer(lapb, skb, LAPB_COMMAND);
...@@ -151,7 +151,7 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type) ...@@ -151,7 +151,7 @@ void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type)
#if LAPB_DEBUG > 2 #if LAPB_DEBUG > 2
printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n", printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n",
lapb->token, lapb->state, lapb->dev, lapb->state,
skb->data[0], skb->data[1], skb->data[2]); skb->data[0], skb->data[1], skb->data[2]);
#endif #endif
...@@ -167,13 +167,13 @@ void lapb_establish_data_link(struct lapb_cb *lapb) ...@@ -167,13 +167,13 @@ void lapb_establish_data_link(struct lapb_cb *lapb)
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n", printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n",
lapb->token, lapb->state); lapb->dev, lapb->state);
#endif #endif
lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n", printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n",
lapb->token, lapb->state); lapb->dev, lapb->state);
#endif #endif
lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
} }
...@@ -186,7 +186,7 @@ void lapb_enquiry_response(struct lapb_cb *lapb) ...@@ -186,7 +186,7 @@ void lapb_enquiry_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n", printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n",
lapb->token, lapb->state, lapb->vr); lapb->dev, lapb->state, lapb->vr);
#endif #endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE);
...@@ -198,7 +198,7 @@ void lapb_timeout_response(struct lapb_cb *lapb) ...@@ -198,7 +198,7 @@ void lapb_timeout_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n", printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n",
lapb->token, lapb->state, lapb->vr); lapb->dev, lapb->state, lapb->vr);
#endif #endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE);
......
net/lapb/lapb_subr.c
View file @ b200a2aa
...@@ -114,7 +114,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb, ...@@ -114,7 +114,7 @@ int lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
#if LAPB_DEBUG > 2 #if LAPB_DEBUG > 2
printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n",
lapb->token, lapb->state, lapb->dev, lapb->state,
skb->data[0], skb->data[1], skb->data[2]); skb->data[0], skb->data[1], skb->data[2]);
#endif #endif
...@@ -287,7 +287,7 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) ...@@ -287,7 +287,7 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
lapb->token, lapb->state, lapb->dev, lapb->state,
skb->data[1], skb->data[2], skb->data[3], skb->data[1], skb->data[2], skb->data[3],
skb->data[4], skb->data[5]); skb->data[4], skb->data[5]);
#endif #endif
...@@ -304,7 +304,7 @@ void lapb_transmit_frmr(struct lapb_cb *lapb) ...@@ -304,7 +304,7 @@ void lapb_transmit_frmr(struct lapb_cb *lapb)
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n",
lapb->token, lapb->state, skb->data[1], lapb->dev, lapb->state, skb->data[1],
skb->data[2], skb->data[3]); skb->data[2], skb->data[3]);
#endif #endif
} }
......
net/lapb/lapb_timer.c
View file @ b200a2aa
...@@ -107,19 +107,19 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -107,19 +107,19 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
#endif #endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
} }
...@@ -135,13 +135,13 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -135,13 +135,13 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT); lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
#endif #endif
return; return;
} else { } else {
lapb->n2count++; lapb->n2count++;
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->dev);
#endif #endif
lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
} }
...@@ -157,7 +157,7 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -157,7 +157,7 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
#endif #endif
return; return;
} else { } else {
...@@ -175,7 +175,7 @@ static void lapb_t1timer_expiry(unsigned long param) ...@@ -175,7 +175,7 @@ static void lapb_t1timer_expiry(unsigned long param)
lapb->state = LAPB_STATE_0; lapb->state = LAPB_STATE_0;
lapb_disconnect_indication(lapb, LAPB_TIMEDOUT); lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
#if LAPB_DEBUG > 0 #if LAPB_DEBUG > 0
printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->token); printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->dev);
#endif #endif
return; return;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7