diff options
Diffstat (limited to 'net/x25/x25_facilities.c')
-rw-r--r-- | net/x25/x25_facilities.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c index b8253250d723..7ecd04c21360 100644 --- a/net/x25/x25_facilities.c +++ b/net/x25/x25_facilities.c | |||
@@ -21,6 +21,8 @@ | |||
21 | * on response. | 21 | * on response. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define pr_fmt(fmt) "X25: " fmt | ||
25 | |||
24 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
25 | #include <linux/string.h> | 27 | #include <linux/string.h> |
26 | #include <linux/skbuff.h> | 28 | #include <linux/skbuff.h> |
@@ -109,7 +111,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, | |||
109 | case X25_MARKER: | 111 | case X25_MARKER: |
110 | break; | 112 | break; |
111 | default: | 113 | default: |
112 | printk(KERN_DEBUG "X.25: unknown facility " | 114 | pr_debug("unknown facility " |
113 | "%02X, value %02X\n", | 115 | "%02X, value %02X\n", |
114 | p[0], p[1]); | 116 | p[0], p[1]); |
115 | break; | 117 | break; |
@@ -132,7 +134,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, | |||
132 | *vc_fac_mask |= X25_MASK_WINDOW_SIZE; | 134 | *vc_fac_mask |= X25_MASK_WINDOW_SIZE; |
133 | break; | 135 | break; |
134 | default: | 136 | default: |
135 | printk(KERN_DEBUG "X.25: unknown facility " | 137 | pr_debug("unknown facility " |
136 | "%02X, values %02X, %02X\n", | 138 | "%02X, values %02X, %02X\n", |
137 | p[0], p[1], p[2]); | 139 | p[0], p[1], p[2]); |
138 | break; | 140 | break; |
@@ -143,7 +145,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, | |||
143 | case X25_FAC_CLASS_C: | 145 | case X25_FAC_CLASS_C: |
144 | if (len < 4) | 146 | if (len < 4) |
145 | return -1; | 147 | return -1; |
146 | printk(KERN_DEBUG "X.25: unknown facility %02X, " | 148 | pr_debug("unknown facility %02X, " |
147 | "values %02X, %02X, %02X\n", | 149 | "values %02X, %02X, %02X\n", |
148 | p[0], p[1], p[2], p[3]); | 150 | p[0], p[1], p[2], p[3]); |
149 | p += 4; | 151 | p += 4; |
@@ -172,7 +174,7 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities, | |||
172 | *vc_fac_mask |= X25_MASK_CALLED_AE; | 174 | *vc_fac_mask |= X25_MASK_CALLED_AE; |
173 | break; | 175 | break; |
174 | default: | 176 | default: |
175 | printk(KERN_DEBUG "X.25: unknown facility %02X," | 177 | pr_debug("unknown facility %02X," |
176 | "length %d\n", p[0], p[1]); | 178 | "length %d\n", p[0], p[1]); |
177 | break; | 179 | break; |
178 | } | 180 | } |
@@ -341,12 +343,12 @@ void x25_limit_facilities(struct x25_facilities *facilities, | |||
341 | 343 | ||
342 | if (!nb->extended) { | 344 | if (!nb->extended) { |
343 | if (facilities->winsize_in > 7) { | 345 | if (facilities->winsize_in > 7) { |
344 | printk(KERN_DEBUG "X.25: incoming winsize limited to 7\n"); | 346 | pr_debug("incoming winsize limited to 7\n"); |
345 | facilities->winsize_in = 7; | 347 | facilities->winsize_in = 7; |
346 | } | 348 | } |
347 | if (facilities->winsize_out > 7) { | 349 | if (facilities->winsize_out > 7) { |
348 | facilities->winsize_out = 7; | 350 | facilities->winsize_out = 7; |
349 | printk( KERN_DEBUG "X.25: outgoing winsize limited to 7\n"); | 351 | pr_debug("outgoing winsize limited to 7\n"); |
350 | } | 352 | } |
351 | } | 353 | } |
352 | } | 354 | } |