linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/usb/r8152.c between commit 445f7f4d6262 ("r8152: fix the
carrier off when autoresuming") from the net tree and commit
b209af9981ee ("r8152: check code with checkpatch.pl") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/net/usb/r8152.c
index e0394427e372,a4d4c4a1354f..000000000000
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -2067,10 -2080,11 +2097,10 @@@ static void rtl_disable(struct r8152 *t
        for (i = 0; i < 1000; i++) {
                if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
                        break;
-               mdelay(1);
+               usleep_range(1000, 2000);
        }
  
 -      for (i = 0; i < RTL8152_MAX_RX; i++)
 -              usb_kill_urb(tp->rx_info[i].urb);
 +      rtl_stop_rx(tp);
  
        rtl8152_nic_reset(tp);
  }
@@@ -3131,12 -3211,13 +3229,13 @@@ static int rtl8152_resume(struct usb_in
                } else {
                        tp->rtl_ops.up(tp);
                        rtl8152_set_speed(tp, AUTONEG_ENABLE,
-                               tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
-                               DUPLEX_FULL);
+                                         tp->mii.supports_gmii ?
+                                         SPEED_1000 : SPEED_100,
+                                         DUPLEX_FULL);
 +                      tp->speed = 0;
 +                      netif_carrier_off(tp->netdev);
 +                      set_bit(WORK_ENABLE, &tp->flags);
                }
 -              tp->speed = 0;
 -              netif_carrier_off(tp->netdev);
 -              set_bit(WORK_ENABLE, &tp->flags);
                usb_submit_urb(tp->intr_urb, GFP_KERNEL);
        }
  

signature.asc
Description: PGP signature