Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking changes from David Miller:

 1) Get rid of the error prone NLA_PUT*() macros that used an embedded
    goto.

 2) Kill off the token-ring and MCA networking drivers, from Paul
    Gortmaker.

 3) Reduce high-order allocations made by datagram AF_UNIX sockets, from
    Eric Dumazet.

 4) Add PTP hardware clock support to IGB and IXGBE, from Richard
    Cochran and Jacob Keller.

 5) Allow users to query timestamping capabilities of a card via
    ethtool, from Richard Cochran.

 6) Add loadbalance mode to the teaming driver, from Jiri Pirko.  Part
    of this is that we can now have BPF filters not attached to sockets,
    and the loadbalancing function is calculated using one.

 7) Francois Romieu went through the network drivers removing gratuitous
    uses of netdev->base_addr, perhaps some day we can remove it
    completely but it's used for ISA probing still.

 8) Add a BPF JIT for sparc.  I know, who cares, right? :-)

 9) Move networking sysctl registry away from using the compatability
    mode interfaces in the sysctl code.  From Eric W Biederman.

10) Pavel Emelyanov added a way to save and restore TCP socket state via
    TCP_REPAIR, TCP_REPAIR_QUEUE, and TCP_QUEUE_SEQ socket options as
    well as a way to forcefully bind a socket to a port via the
    sk->sk_reuse value SK_FORCE_REUSE.  There is also a
    TCP_REPAIR_OPTIONS which allows to reinstante the TCP options
    enabled on the connection.

11) Several enhancements from Eric Dumazet that, in particular, can
    enhance splice performance on TCP sockets significantly.

     a) Reset the offset of the per-socket sendmsg page when we know
        we're the only use of the page in linear_to_page().

     b) Add facilities such that skb->data can be backed a page rather
        than SLAB kmalloc'd memory.  In particular devices which were
        receiving into linear RX buffers can now end up providing paged
        data.

    The big result is that code like splice and GRO do not have to copy
    any more.

12) Allow a pure sender to more gracefully handle ACK backlogs in TCP.
    What can happen at high rates is that the sender hasn't grown his
    receive buffer limits at all (he's not receiving data so really
    doesn't need to), but the non-data ACKs consume receive buffer
    space.

    sk_add_backlog() is too aggressive in dropping frames in this case,
    so relax it's requirements by using the receive buffer plus the send
    buffer limit as the backlog limit instead of just the former.

    Also from Eric Dumazet.

13) Add ipv6 support to L2TP, from Benjamin LaHaise, James Chapman, and
    Chris Elston.

14) Implement TCP early retransmit (RFC 5827), from Yuchung Cheng.
    Basically, we can start fast retransmit before hiting the dupack
    threshold under certain conditions.

15) New CODEL active queue management packet scheduler, from Eric
    Dumazet based upon initial work by Dave Taht.

    Basically, the big feature is that packets are dropped (or ECN bits
    are set) based upon how long packets live in the queue, rather than
    the queue length (which is what RED uses).

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1341 commits)
  drivers/net/stmmac: seq_file fix memory leak
  ipv6/exthdrs: strict Pad1 and PadN check
  USB: qmi_wwan: Add ZTE (Vodafone) K3520-Z
  USB: qmi_wwan: Add ZTE (Vodafone) K3765-Z
  USB: qmi_wwan: Make forced int 4 whitelist generic
  net/ipv4: replace simple_strtoul with kstrtoul
  net/ipv4/ipconfig: neaten __setup placement
  net: qmi_wwan: Add Vodafone/Huawei K5005 support
  net: cdc_ether: Add ZTE WWAN matches before generic Ethernet
  ipv6: use skb coalescing in reassembly
  ipv4: use skb coalescing in defragmentation
  net: introduce skb_try_coalesce()
  net:ipv6:fixed space issues relating to operators.
  net:ipv6:fixed a trailing white space issue.
  ipv6: disable GSO on sockets hitting dst_allfrag
  tg3: use netdev_alloc_frag() API
  net: napi_frags_skb() is static
  ppp: avoid false drop_monitor false positives
  ipv6: bool/const conversions phase2
  ipx: Remove spurious NULL checking in ipx_ioctl().
  ...

1 files changed, 91 insertions, 229 deletions

diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c
index f4e3c1accab7..5dba899131b3 100644
--- a/net/lapb/lapb_in.c
+++ b/net/lapb/lapb_in.c
@@ -15,6 +15,8 @@
  *      2000-10-29      Henner Eisen    lapb_data_indication() return status.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -44,25 +46,16 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S0 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -78,18 +71,11 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S0 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S0 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -102,22 +88,16 @@ static void lapb_state0_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_connect_indication(lapb, LAPB_OK);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S0 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S0 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S0 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S0 TX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S0 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S0 TX UA(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 break;
 
@@ -137,68 +117,45 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S1 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S1 TX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S1 TX DM(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_UA:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX UA(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S1 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S1 -> S3\n", lapb->dev);
                         lapb_stop_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state     = LAPB_STATE_3;
@@ -212,14 +169,9 @@ static void lapb_state1_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S1 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S1 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
                         lapb_clear_queues(lapb);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
@@ -242,34 +194,22 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
         switch (frame->type) {
         case LAPB_SABM:
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX {SABM,SABME}(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 TX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX {SABM,SABME}(%d)\n",
+                         lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S2 TX DM(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_DM, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 TX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(1, "(%p) S2 TX UA(%d)\n", lapb->dev, frame->pf);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 break;
 
         case LAPB_UA:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX UA(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX UA(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
@@ -278,14 +218,9 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf) {
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
                         lapb->state = LAPB_STATE_0;
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
@@ -297,12 +232,9 @@ static void lapb_state2_machine(struct lapb_cb *lapb, struct sk_buff *skb,
         case LAPB_REJ:
         case LAPB_RNR:
         case LAPB_RR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S2 RX {I,REJ,RNR,RR}(%d)\n",
-                       lapb->dev, frame->pf);
-                printk(KERN_DEBUG "lapb: (%p) S2 RX DM(%d)\n",
+                lapb_dbg(1, "(%p) S2 RX {I,REJ,RNR,RR}(%d)\n",
                        lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S2 RX DM(%d)\n", lapb->dev, frame->pf);
                 if (frame->pf)
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
@@ -325,22 +257,15 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -355,15 +280,10 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -375,23 +295,16 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_requeue_frames(lapb);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S3 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S3 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }
                 break;
 
         case LAPB_DISC:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX DISC(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
-#endif
+                lapb_dbg(1, "(%p) S3 RX DISC(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
                 lapb_clear_queues(lapb);
                 lapb_send_control(lapb, LAPB_UA, frame->pf, LAPB_RESPONSE);
                 lapb_start_t1timer(lapb);
@@ -401,13 +314,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_DM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX DM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
-#endif
+                lapb_dbg(1, "(%p) S3 RX DM(%d)\n", lapb->dev, frame->pf);
+                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
                 lapb_clear_queues(lapb);
                 lapb->state = LAPB_STATE_0;
                 lapb_start_t1timer(lapb);
@@ -416,10 +324,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_RNR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX RNR(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX RNR(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition |= LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -428,9 +334,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -439,10 +343,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_RR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX RR(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX RR(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -451,9 +353,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -462,10 +362,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_REJ:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX REJ(%d) R%d\n",
-                       lapb->dev, frame->pf, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX REJ(%d) R%d\n",
+                         lapb->dev, frame->pf, frame->nr);
                 lapb->condition &= ~LAPB_PEER_RX_BUSY_CONDITION;
                 lapb_check_need_response(lapb, frame->cr, frame->pf);
                 if (lapb_validate_nr(lapb, frame->nr)) {
@@ -477,9 +375,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -488,17 +384,13 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_I:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX I(%d) S%d R%d\n",
-                       lapb->dev, frame->pf, frame->ns, frame->nr);
-#endif
+                lapb_dbg(1, "(%p) S3 RX I(%d) S%d R%d\n",
+                         lapb->dev, frame->pf, frame->ns, frame->nr);
                 if (!lapb_validate_nr(lapb, frame->nr)) {
                         lapb->frmr_data = *frame;
                         lapb->frmr_type = LAPB_FRMR_Z;
                         lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                        lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                         lapb_start_t1timer(lapb);
                         lapb_stop_t2timer(lapb);
                         lapb->state   = LAPB_STATE_4;
@@ -522,7 +414,7 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                          * a frame lost on the wire.
                          */
                         if (cn == NET_RX_DROP) {
-                                printk(KERN_DEBUG "LAPB: rx congestion\n");
+                                pr_debug("rx congestion\n");
                                 break;
                         }
                         lapb->vr = (lapb->vr + 1) % modulus;
@@ -541,11 +433,8 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                                 if (frame->pf)
                                         lapb_enquiry_response(lapb);
                         } else {
-#if LAPB_DEBUG > 1
-                                printk(KERN_DEBUG
-                                       "lapb: (%p) S3 TX REJ(%d) R%d\n",
-                                       lapb->dev, frame->pf, lapb->vr);
-#endif
+                                lapb_dbg(1, "(%p) S3 TX REJ(%d) R%d\n",
+                                         lapb->dev, frame->pf, lapb->vr);
                                 lapb->condition |= LAPB_REJECT_CONDITION;
                                 lapb_send_control(lapb, LAPB_REJ, frame->pf,
                                                   LAPB_RESPONSE);
@@ -555,31 +444,22 @@ static void lapb_state3_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_FRMR:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX FRMR(%d) %02X "
-                       "%02X %02X %02X %02X\n", lapb->dev, frame->pf,
-                       skb->data[0], skb->data[1], skb->data[2],
-                       skb->data[3], skb->data[4]);
-#endif
+                lapb_dbg(1, "(%p) S3 RX FRMR(%d) %02X %02X %02X %02X %02X\n",
+                         lapb->dev, frame->pf,
+                         skb->data[0], skb->data[1], skb->data[2],
+                         skb->data[3], skb->data[4]);
                 lapb_establish_data_link(lapb);
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S1\n", lapb->dev);
-#endif
+                lapb_dbg(0, "(%p) S3 -> S1\n", lapb->dev);
                 lapb_requeue_frames(lapb);
                 lapb->state = LAPB_STATE_1;
                 break;
 
         case LAPB_ILLEGAL:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S3 RX ILLEGAL(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S3 RX ILLEGAL(%d)\n", lapb->dev, frame->pf);
                 lapb->frmr_data = *frame;
                 lapb->frmr_type = LAPB_FRMR_W;
                 lapb_transmit_frmr(lapb);
-#if LAPB_DEBUG > 0
-                printk(KERN_DEBUG "lapb: (%p) S3 -> S4\n", lapb->dev);
-#endif
+                lapb_dbg(0, "(%p) S3 -> S4\n", lapb->dev);
                 lapb_start_t1timer(lapb);
                 lapb_stop_t2timer(lapb);
                 lapb->state   = LAPB_STATE_4;
@@ -600,25 +480,16 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
 {
         switch (frame->type) {
         case LAPB_SABM:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S4 RX SABM(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S4 RX SABM(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S4 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -634,18 +505,11 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                 break;
 
         case LAPB_SABME:
-#if LAPB_DEBUG > 1
-                printk(KERN_DEBUG "lapb: (%p) S4 RX SABME(%d)\n",
-                       lapb->dev, frame->pf);
-#endif
+                lapb_dbg(1, "(%p) S4 RX SABME(%d)\n", lapb->dev, frame->pf);
                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX UA(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
-#if LAPB_DEBUG > 0
-                        printk(KERN_DEBUG "lapb: (%p) S4 -> S3\n", lapb->dev);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX UA(%d)\n",
+                                 lapb->dev, frame->pf);
+                        lapb_dbg(0, "(%p) S4 -> S3\n", lapb->dev);
                         lapb_send_control(lapb, LAPB_UA, frame->pf,
                                           LAPB_RESPONSE);
                         lapb_stop_t1timer(lapb);
@@ -658,10 +522,8 @@ static void lapb_state4_machine(struct lapb_cb *lapb, struct sk_buff *skb,
                         lapb->va        = 0;
                         lapb_connect_indication(lapb, LAPB_OK);
                 } else {
-#if LAPB_DEBUG > 1
-                        printk(KERN_DEBUG "lapb: (%p) S4 TX DM(%d)\n",
-                               lapb->dev, frame->pf);
-#endif
+                        lapb_dbg(1, "(%p) S4 TX DM(%d)\n",
+                                 lapb->dev, frame->pf);
                         lapb_send_control(lapb, LAPB_DM, frame->pf,
                                           LAPB_RESPONSE);
                 }