93 files changed, 3345 insertions, 1266 deletions
diff --git a/Documentation/devicetree/bindings/net/mdio-mux-gpio.txt b/Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
new file mode 100644
index 000000000000..79384113c2b0
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/mdio-mux-gpio.txt
@@ -0,0 +1,127 @@
+Properties for an MDIO bus multiplexer/switch controlled by GPIO pins.
+This is a special case of a MDIO bus multiplexer.  One or more GPIO
+lines are used to control which child bus is connected.
+Required properties in addition to the generic multiplexer properties:
+- compatible : mdio-mux-gpio.
+- gpios : GPIO specifiers for each GPIO line.  One or more must be specified.
+Example :
+        /* The parent MDIO bus. */
+        smi1: mdio@1180000001900 {
+                compatible = "cavium,octeon-3860-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x11800 0x00001900 0x0 0x40>;
+        };
+        /*
+           An NXP sn74cbtlv3253 dual 1-of-4 switch controlled by a
+           pair of GPIO lines.  Child busses 2 and 3 populated with 4
+           PHYs each.
+         */
+        mdio-mux {
+                compatible = "mdio-mux-gpio";
+                gpios = <&gpio1 3 0>, <&gpio1 4 0>;
+                mdio-parent-bus = <&smi1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                mdio@2 {
+                        reg = <2>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        phy11: ethernet-phy@1 {
+                                reg = <1>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy12: ethernet-phy@2 {
+                                reg = <2>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy13: ethernet-phy@3 {
+                                reg = <3>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy14: ethernet-phy@4 {
+                                reg = <4>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                };
+                mdio@3 {
+                        reg = <3>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        phy21: ethernet-phy@1 {
+                                reg = <1>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy22: ethernet-phy@2 {
+                                reg = <2>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy23: ethernet-phy@3 {
+                                reg = <3>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy24: ethernet-phy@4 {
+                                reg = <4>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/mdio-mux.txt b/Documentation/devicetree/bindings/net/mdio-mux.txt
new file mode 100644
index 000000000000..f65606f8d632
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/mdio-mux.txt
@@ -0,0 +1,136 @@
+Common MDIO bus multiplexer/switch properties.
+An MDIO bus multiplexer/switch will have several child busses that are
+numbered uniquely in a device dependent manner.  The nodes for an MDIO
+bus multiplexer/switch will have one child node for each child bus.
+Required properties:
+- mdio-parent-bus : phandle to the parent MDIO bus.
+- #address-cells = <1>;
+- #size-cells = <0>;
+Optional properties:
+- Other properties specific to the multiplexer/switch hardware.
+Required properties for child nodes:
+- #address-cells = <1>;
+- #size-cells = <0>;
+- reg : The sub-bus number.
+Example :
+        /* The parent MDIO bus. */
+        smi1: mdio@1180000001900 {
+                compatible = "cavium,octeon-3860-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x11800 0x00001900 0x0 0x40>;
+        };
+        /*
+           An NXP sn74cbtlv3253 dual 1-of-4 switch controlled by a
+           pair of GPIO lines.  Child busses 2 and 3 populated with 4
+           PHYs each.
+         */
+        mdio-mux {
+                compatible = "mdio-mux-gpio";
+                gpios = <&gpio1 3 0>, <&gpio1 4 0>;
+                mdio-parent-bus = <&smi1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                mdio@2 {
+                        reg = <2>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        phy11: ethernet-phy@1 {
+                                reg = <1>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy12: ethernet-phy@2 {
+                                reg = <2>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy13: ethernet-phy@3 {
+                                reg = <3>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                        phy14: ethernet-phy@4 {
+                                reg = <4>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <10 8>; /* Pin 10, active low */
+                        };
+                };
+                mdio@3 {
+                        reg = <3>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        phy21: ethernet-phy@1 {
+                                reg = <1>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy22: ethernet-phy@2 {
+                                reg = <2>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy23: ethernet-phy@3 {
+                                reg = <3>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                        phy24: ethernet-phy@4 {
+                                reg = <4>;
+                                compatible = "marvell,88e1149r";
+                                marvell,reg-init = <3 0x10 0 0x5777>,
+                                        <3 0x11 0 0x00aa>,
+                                        <3 0x12 0 0x4105>,
+                                        <3 0x13 0 0x0a60>;
+                                interrupt-parent = <&gpio>;
+                                interrupts = <12 8>; /* Pin 12, active low */
+                        };
+                };
+        };
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 9b569a2d9c60..34916e792d9d 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -190,6 +190,20 @@ tcp_cookie_size - INTEGER
 tcp_dsack - BOOLEAN
        Allows TCP to send "duplicate" SACKs.
+tcp_early_retrans - INTEGER
+        Enable Early Retransmit (ER), per RFC 5827. ER lowers the threshold
+        for triggering fast retransmit when the amount of outstanding data is
+        small and when no previously unsent data can be transmitted (such
+        that limited transmit could be used).
+        Possible values:
+                0 disables ER
+                1 enables ER
+                2 enables ER but delays fast recovery and fast retransmit
+                  by a fourth of RTT. This mitigates connection falsely
+                  recovers when network has a small degree of reordering
+                  (less than 3 packets).
+        Default: 2
 tcp_ecn - INTEGER
        Enable Explicit Congestion Notification (ECN) in TCP. ECN is only
        used when both ends of the TCP flow support it. It is useful to
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index f8f41e0e8a8c..89b30f32ba68 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -802,7 +802,7 @@ static void fill_rx_pool (amb_dev * dev, unsigned char pool,
    }
    // cast needed as there is no %? for pointer differences
    PRINTD (DBG_SKB, "allocated skb at %p, head %p, area %li",
-            skb, skb->head, (long) (skb_end_pointer(skb) - skb->head));
+            skb, skb->head, (long) skb_end_offset(skb));
    rx.handle = virt_to_bus (skb);
    rx.host_address = cpu_to_be32 (virt_to_bus (skb->data));
    if (rx_give (dev, &rx, pool))
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 1c052127548c..8974bd2b961e 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -1258,7 +1258,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
        tail = readl(SAR_REG_RAWCT);
        pci_dma_sync_single_for_cpu(card->pcidev, IDT77252_PRV_PADDR(queue),
-                                    skb_end_pointer(queue) - queue->head - 16,
+                                    skb_end_offset(queue) - 16,
                                    PCI_DMA_FROMDEVICE);
        while (head != tail) {
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index b902794bbf07..38c4bd87b2c9 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -336,11 +336,6 @@ static inline void
 capincci_alloc_minor(struct capidev *cdev, struct capincci *np) { }
 static inline void capincci_free_minor(struct capincci *np) { }
-static inline unsigned int capincci_minor_opencount(struct capincci *np)
-{
-        return 0;
-}
 #endif /* !CONFIG_ISDN_CAPI_MIDDLEWARE */
 static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
@@ -372,6 +367,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                }
 }
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 static struct capincci *capincci_find(struct capidev *cdev, u32 ncci)
 {
        struct capincci *np;
@@ -382,7 +378,6 @@ static struct capincci *capincci_find(struct capidev *cdev, u32 ncci)
        return NULL;
 }
-#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 /* -------- handle data queue --------------------------------------- */
 static struct sk_buff *
@@ -578,8 +573,8 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
        struct tty_struct *tty;
        struct capiminor *mp;
        u16 datahandle;
-#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
        struct capincci *np;
+#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
        mutex_lock(&cdev->lock);
@@ -597,6 +592,12 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                goto unlock_out;
        }
+#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
+        skb_queue_tail(&cdev->recvqueue, skb);
+        wake_up_interruptible(&cdev->recvwait);
+#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
        np = capincci_find(cdev, CAPIMSG_CONTROL(skb->data));
        if (!np) {
                printk(KERN_ERR "BUG: capi_signal: ncci not found\n");
@@ -605,12 +606,6 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                goto unlock_out;
        }
-#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
-        skb_queue_tail(&cdev->recvqueue, skb);
-        wake_up_interruptible(&cdev->recvwait);
-#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
        mp = np->minorp;
        if (!mp) {
                skb_queue_tail(&cdev->recvqueue, skb);
@@ -786,7 +781,6 @@ register_out:
                return retval;
        case CAPI_GET_VERSION:
-        {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -796,11 +790,9 @@ register_out:
                if (copy_to_user(argp, &data.version,
                                 sizeof(data.version)))
                        return -EFAULT;
-        }
+                return 0;
-        return 0;
        case CAPI_GET_SERIAL:
-        {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -810,10 +802,9 @@ register_out:
                if (copy_to_user(argp, data.serial,
                                 sizeof(data.serial)))
                        return -EFAULT;
-        }
+                return 0;
-        return 0;
        case CAPI_GET_PROFILE:
-        {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -837,11 +828,9 @@ register_out:
                }
                if (retval)
                        return -EFAULT;
-        }
+                return 0;
-        return 0;
        case CAPI_GET_MANUFACTURER:
-        {
                if (copy_from_user(&data.contr, argp,
                                   sizeof(data.contr)))
                        return -EFAULT;
@@ -853,8 +842,8 @@ register_out:
                                 sizeof(data.manufacturer)))
                        return -EFAULT;
-        }
+                return 0;
-        return 0;
        case CAPI_GET_ERRCODE:
                data.errcode = cdev->errcode;
                cdev->errcode = CAPI_NOERROR;
@@ -870,8 +859,7 @@ register_out:
                        return 0;
                return -ENXIO;
-        case CAPI_MANUFACTURER_CMD:
+        case CAPI_MANUFACTURER_CMD: {
-        {
                struct capi_manufacturer_cmd mcmd;
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
@@ -879,8 +867,6 @@ register_out:
                        return -EFAULT;
                return capi20_manufacturer(mcmd.cmd, mcmd.data);
        }
-        return 0;
        case CAPI_SET_FLAGS:
        case CAPI_CLR_FLAGS: {
                unsigned userflags;
@@ -902,6 +888,11 @@ register_out:
                        return -EFAULT;
                return 0;
+#ifndef CONFIG_ISDN_CAPI_MIDDLEWARE
+        case CAPI_NCCI_OPENCOUNT:
+                return 0;
+#else /* CONFIG_ISDN_CAPI_MIDDLEWARE */
        case CAPI_NCCI_OPENCOUNT: {
                struct capincci *nccip;
                unsigned ncci;
@@ -918,7 +909,6 @@ register_out:
                return count;
        }
-#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
        case CAPI_NCCI_GETUNIT: {
                struct capincci *nccip;
                struct capiminor *mp;
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 6f5016b479f8..832bc807ed20 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1593,7 +1593,7 @@ static int capidrv_command(isdn_ctrl *c, capidrv_contr *card)
                return capidrv_ioctl(c, card);
        switch (c->command) {
-        case ISDN_CMD_DIAL:{
+        case ISDN_CMD_DIAL: {
                u8 calling[ISDN_MSNLEN + 3];
                u8 called[ISDN_MSNLEN + 2];
@@ -2072,7 +2072,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
        card->interface.writebuf_skb = if_sendbuf;
        card->interface.writecmd = NULL;
        card->interface.readstat = if_readstat;
-        card->interface.features = ISDN_FEATURE_L2_HDLC |
+        card->interface.features =
+                ISDN_FEATURE_L2_HDLC |
                ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_UNKNOWN |
@@ -2080,7 +2081,8 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                ISDN_FEATURE_L2_X75UI |
                ISDN_FEATURE_L2_X75BUI;
        if (profp->support1 & (1 << 2))
-                card->interface.features |= ISDN_FEATURE_L2_V11096 |
+                card->interface.features |=
+                        ISDN_FEATURE_L2_V11096 |
                        ISDN_FEATURE_L2_V11019 |
                        ISDN_FEATURE_L2_V11038;
        if (profp->support1 & (1 << 8))
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index afa080258bfa..3b9278b333ba 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -410,10 +410,10 @@ static void check_pending(struct bas_cardstate *ucs)
                if (!(ucs->basstate & BS_RESETTING))
                        ucs->pending = 0;
                break;
-                /*
+        /*
-                 * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
+         * HD_READ_ATMESSAGE and HD_WRITE_ATMESSAGE are handled separately
-                 * and should never end up here
+         * and should never end up here
-                 */
+         */
        default:
                dev_warn(&ucs->interface->dev,
                         "unknown pending request 0x%02x cleared\n",
@@ -877,8 +877,7 @@ static void read_iso_callback(struct urb *urb)
                for (i = 0; i < BAS_NUMFRAMES; i++) {
                        ubc->isoinlost += urb->iso_frame_desc[i].actual_length;
                        if (unlikely(urb->iso_frame_desc[i].status != 0 &&
-                                     urb->iso_frame_desc[i].status !=
+                                     urb->iso_frame_desc[i].status != -EINPROGRESS))
-                                     -EINPROGRESS))
                                ubc->loststatus = urb->iso_frame_desc[i].status;
                        urb->iso_frame_desc[i].status = 0;
                        urb->iso_frame_desc[i].actual_length = 0;
@@ -2078,16 +2077,14 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
 /* Free hardware dependent part of the B channel structure
 * parameter:
 *      bcs     B channel structure
- * return value:
- *      !=0 on success
 */
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
        struct bas_bc_state *ubc = bcs->hw.bas;
        int i;
        if (!ubc)
-                return 0;
+                return;
        /* kill URBs and tasklets before freeing - better safe than sorry */
        ubc->running = 0;
@@ -2105,14 +2102,13 @@ static int gigaset_freebcshw(struct bc_state *bcs)
        kfree(ubc->isooutbuf);
        kfree(ubc);
        bcs->hw.bas = NULL;
-        return 1;
 }
 /* Initialize hardware dependent part of the B channel structure
 * parameter:
 *      bcs     B channel structure
 * return value:
- *      !=0 on success
+ *      0 on success, error code < 0 on failure
 */
 static int gigaset_initbcshw(struct bc_state *bcs)
 {
@@ -2122,7 +2118,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
        bcs->hw.bas = ubc = kmalloc(sizeof(struct bas_bc_state), GFP_KERNEL);
        if (!ubc) {
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        ubc->running = 0;
@@ -2139,7 +2135,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
                pr_err("out of memory\n");
                kfree(ubc);
                bcs->hw.bas = NULL;
-                return 0;
+                return -ENOMEM;
        }
        tasklet_init(&ubc->sent_tasklet,
                     write_iso_tasklet, (unsigned long) bcs);
@@ -2164,7 +2160,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
        ubc->stolen0s = 0;
        tasklet_init(&ubc->rcvd_tasklet,
                     read_iso_tasklet, (unsigned long) bcs);
-        return 1;
+        return 0;
 }
 static void gigaset_reinitbcshw(struct bc_state *bcs)
@@ -2187,6 +2183,12 @@ static void gigaset_freecshw(struct cardstate *cs)
        cs->hw.bas = NULL;
 }
+/* Initialize hardware dependent part of the cardstate structure
+ * parameter:
+ *      cs      cardstate structure
+ * return value:
+ *      0 on success, error code < 0 on failure
+ */
 static int gigaset_initcshw(struct cardstate *cs)
 {
        struct bas_cardstate *ucs;
@@ -2194,13 +2196,13 @@ static int gigaset_initcshw(struct cardstate *cs)
        cs->hw.bas = ucs = kmalloc(sizeof *ucs, GFP_KERNEL);
        if (!ucs) {
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
        if (!ucs->int_in_buf) {
                kfree(ucs);
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        ucs->urb_cmd_in = NULL;
@@ -2219,7 +2221,7 @@ static int gigaset_initcshw(struct cardstate *cs)
        init_waitqueue_head(&ucs->waitqueue);
        INIT_WORK(&ucs->int_in_wq, int_in_work);
-        return 1;
+        return 0;
 }
 /* freeurbs
@@ -2379,18 +2381,20 @@ static int gigaset_probe(struct usb_interface *interface,
        /* save address of controller structure */
        usb_set_intfdata(interface, cs);
-        if (!gigaset_start(cs))
+        rc = gigaset_start(cs);
+        if (rc < 0)
                goto error;
        return 0;
 allocerr:
        dev_err(cs->dev, "could not allocate URBs\n");
+        rc = -ENOMEM;
 error:
        freeurbs(cs);
        usb_set_intfdata(interface, NULL);
        gigaset_freecs(cs);
-        return -ENODEV;
+        return rc;
 }
 /* gigaset_disconnect
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index 343b5c80cb7b..27e4a3e21d64 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -14,6 +14,7 @@
 #include "gigaset.h"
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/ratelimit.h>
 #include <linux/isdn/capilli.h>
 #include <linux/isdn/capicmd.h>
 #include <linux/isdn/capiutil.h>
@@ -108,51 +109,35 @@ static struct {
        u8 *bc;
        u8 *hlc;
 } cip2bchlc[] = {
-        [1] = { "8090A3", NULL },
+        [1] = { "8090A3", NULL },       /* Speech (A-law) */
-        /* Speech (A-law) */
+        [2] = { "8890", NULL },         /* Unrestricted digital information */
-        [2] = { "8890", NULL },
+        [3] = { "8990", NULL },         /* Restricted digital information */
-        /* Unrestricted digital information */
+        [4] = { "9090A3", NULL },       /* 3,1 kHz audio (A-law) */
-        [3] = { "8990", NULL },
+        [5] = { "9190", NULL },         /* 7 kHz audio */
-        /* Restricted digital information */
+        [6] = { "9890", NULL },         /* Video */
-        [4] = { "9090A3", NULL },
+        [7] = { "88C0C6E6", NULL },     /* Packet mode */
-        /* 3,1 kHz audio (A-law) */
+        [8] = { "8890218F", NULL },     /* 56 kbit/s rate adaptation */
-        [5] = { "9190", NULL },
+        [9] = { "9190A5", NULL },       /* Unrestricted digital information
-        /* 7 kHz audio */
+                                         * with tones/announcements */
-        [6] = { "9890", NULL },
+        [16] = { "8090A3", "9181" },    /* Telephony */
-        /* Video */
+        [17] = { "9090A3", "9184" },    /* Group 2/3 facsimile */
-        [7] = { "88C0C6E6", NULL },
+        [18] = { "8890", "91A1" },      /* Group 4 facsimile Class 1 */
-        /* Packet mode */
+        [19] = { "8890", "91A4" },      /* Teletex service basic and mixed mode
-        [8] = { "8890218F", NULL },
+                                         * and Group 4 facsimile service
-        /* 56 kbit/s rate adaptation */
+                                         * Classes II and III */
-        [9] = { "9190A5", NULL },
+        [20] = { "8890", "91A8" },      /* Teletex service basic and
-        /* Unrestricted digital information with tones/announcements */
+                                         * processable mode */
-        [16] = { "8090A3", "9181" },
+        [21] = { "8890", "91B1" },      /* Teletex service basic mode */
-        /* Telephony */
+        [22] = { "8890", "91B2" },      /* International interworking for
-        [17] = { "9090A3", "9184" },
+                                         * Videotex */
-        /* Group 2/3 facsimile */
+        [23] = { "8890", "91B5" },      /* Telex */
-        [18] = { "8890", "91A1" },
+        [24] = { "8890", "91B8" },      /* Message Handling Systems
-        /* Group 4 facsimile Class 1 */
+                                         * in accordance with X.400 */
-        [19] = { "8890", "91A4" },
+        [25] = { "8890", "91C1" },      /* OSI application
-        /* Teletex service basic and mixed mode
+                                         * in accordance with X.200 */
-           and Group 4 facsimile service Classes II and III */
+        [26] = { "9190A5", "9181" },    /* 7 kHz telephony */
-        [20] = { "8890", "91A8" },
+        [27] = { "9190A5", "916001" },  /* Video telephony, first connection */
-        /* Teletex service basic and processable mode */
+        [28] = { "8890", "916002" },    /* Video telephony, second connection */
-        [21] = { "8890", "91B1" },
-        /* Teletex service basic mode */
-        [22] = { "8890", "91B2" },
-        /* International interworking for Videotex */
-        [23] = { "8890", "91B5" },
-        /* Telex */
-        [24] = { "8890", "91B8" },
-        /* Message Handling Systems in accordance with X.400 */
-        [25] = { "8890", "91C1" },
-        /* OSI application in accordance with X.200 */
-        [26] = { "9190A5", "9181" },
-        /* 7 kHz telephony */
-        [27] = { "9190A5", "916001" },
-        /* Video telephony, first connection */
-        [28] = { "8890", "916002" },
-        /* Video telephony, second connection */
 };
 /*
@@ -223,10 +208,14 @@ get_appl(struct gigaset_capi_ctr *iif, u16 appl)
 static inline void dump_cmsg(enum debuglevel level, const char *tag, _cmsg *p)
 {
 #ifdef CONFIG_GIGASET_DEBUG
+        /* dump at most 20 messages in 20 secs */
+        static DEFINE_RATELIMIT_STATE(msg_dump_ratelimit, 20 * HZ, 20);
        _cdebbuf *cdb;
        if (!(gigaset_debuglevel & level))
                return;
+        if (!___ratelimit(&msg_dump_ratelimit, tag))
+                return;
        cdb = capi_cmsg2str(p);
        if (cdb) {
@@ -1192,7 +1181,9 @@ static void do_facility_req(struct gigaset_capi_ctr *iif,
                        confparam[3] = 2;       /* length */
                        capimsg_setu16(confparam, 4, CapiSuccess);
                        break;
-                        /* ToDo: add supported services */
+                /* ToDo: add supported services */
                default:
                        dev_notice(cs->dev,
                                   "%s: unsupported supplementary service function 0x%04x\n",
@@ -1766,7 +1757,8 @@ static void do_connect_b3_req(struct gigaset_capi_ctr *iif,
        /* NCPI parameter: not applicable for B3 Transparent */
        ignore_cstruct_param(cs, cmsg->NCPI, "CONNECT_B3_REQ", "NCPI");
-        send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ?
+        send_conf(iif, ap, skb,
+                  (cmsg->NCPI && cmsg->NCPI[0]) ?
                  CapiNcpiNotSupportedByProtocol : CapiSuccess);
 }
@@ -1882,6 +1874,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
        /* check for active logical connection */
        if (bcs->apconnstate >= APCONN_ACTIVE) {
+                /* clear it */
+                bcs->apconnstate = APCONN_SETUP;
                /*
                 * emit DISCONNECT_B3_IND with cause 0x3301
                 * use separate cmsg structure, as the content of iif->acmsg
@@ -1906,6 +1901,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif,
                }
                capi_cmsg2message(b3cmsg,
                                  __skb_put(b3skb, CAPI_DISCONNECT_B3_IND_BASELEN));
+                dump_cmsg(DEBUG_CMD, __func__, b3cmsg);
                kfree(b3cmsg);
                capi_ctr_handle_message(&iif->ctr, ap->id, b3skb);
        }
@@ -1966,7 +1962,8 @@ static void do_disconnect_b3_req(struct gigaset_capi_ctr *iif,
        /* NCPI parameter: not applicable for B3 Transparent */
        ignore_cstruct_param(cs, cmsg->NCPI,
                             "DISCONNECT_B3_REQ", "NCPI");
-        send_conf(iif, ap, skb, (cmsg->NCPI && cmsg->NCPI[0]) ?
+        send_conf(iif, ap, skb,
+                  (cmsg->NCPI && cmsg->NCPI[0]) ?
                  CapiNcpiNotSupportedByProtocol : CapiSuccess);
 }
@@ -2059,12 +2056,6 @@ static void do_reset_b3_req(struct gigaset_capi_ctr *iif,
 }
 /*
- * dump unsupported/ignored messages at most twice per minute,
- * some apps send those very frequently
- */
-static unsigned long ignored_msg_dump_time;
-/*
 * unsupported CAPI message handler
 */
 static void do_unsupported(struct gigaset_capi_ctr *iif,
@@ -2073,8 +2064,7 @@ static void do_unsupported(struct gigaset_capi_ctr *iif,
 {
        /* decode message */
        capi_message2cmsg(&iif->acmsg, skb->data);
-        if (printk_timed_ratelimit(&ignored_msg_dump_time, 30 * 1000))
+        dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
-                dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
        send_conf(iif, ap, skb, CapiMessageNotSupportedInCurrentState);
 }
@@ -2085,11 +2075,9 @@ static void do_nothing(struct gigaset_capi_ctr *iif,
                       struct gigaset_capi_appl *ap,
                       struct sk_buff *skb)
 {
-        if (printk_timed_ratelimit(&ignored_msg_dump_time, 30 * 1000)) {
+        /* decode message */
-                /* decode message */
+        capi_message2cmsg(&iif->acmsg, skb->data);
-                capi_message2cmsg(&iif->acmsg, skb->data);
+        dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
-                dump_cmsg(DEBUG_CMD, __func__, &iif->acmsg);
-        }
        dev_kfree_skb_any(skb);
 }
@@ -2358,7 +2346,7 @@ static const struct file_operations gigaset_proc_fops = {
 * @cs:         device descriptor structure.
 * @isdnid:     device name.
 *
- * Return value: 1 for success, 0 for failure
+ * Return value: 0 on success, error code < 0 on failure
 */
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
@@ -2368,7 +2356,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        iif = kmalloc(sizeof(*iif), GFP_KERNEL);
        if (!iif) {
                pr_err("%s: out of memory\n", __func__);
-                return 0;
+                return -ENOMEM;
        }
        /* prepare controller structure */
@@ -2392,12 +2380,12 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        if (rc) {
                pr_err("attach_capi_ctr failed (%d)\n", rc);
                kfree(iif);
-                return 0;
+                return rc;
        }
        cs->iif = iif;
        cs->hw_hdr_len = CAPI_DATA_B3_REQ_LEN;
-        return 1;
+        return 0;
 }
 /**
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 76792707f995..aa41485bc594 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -194,13 +194,13 @@ int gigaset_get_channel(struct bc_state *bcs)
                gig_dbg(DEBUG_CHANNEL, "could not allocate channel %d",
                        bcs->channel);
                spin_unlock_irqrestore(&bcs->cs->lock, flags);
-                return 0;
+                return -EBUSY;
        }
        ++bcs->use_count;
        bcs->busy = 1;
        gig_dbg(DEBUG_CHANNEL, "allocated channel %d", bcs->channel);
        spin_unlock_irqrestore(&bcs->cs->lock, flags);
-        return 1;
+        return 0;
 }
 struct bc_state *gigaset_get_free_channel(struct cardstate *cs)
@@ -258,7 +258,7 @@ int gigaset_get_channels(struct cardstate *cs)
                        spin_unlock_irqrestore(&cs->lock, flags);
                        gig_dbg(DEBUG_CHANNEL,
                                "could not allocate all channels");
-                        return 0;
+                        return -EBUSY;
                }
        for (i = 0; i < cs->channels; ++i)
                ++cs->bcs[i].use_count;
@@ -266,7 +266,7 @@ int gigaset_get_channels(struct cardstate *cs)
        gig_dbg(DEBUG_CHANNEL, "allocated all channels");
-        return 1;
+        return 0;
 }
 void gigaset_free_channels(struct cardstate *cs)
@@ -362,7 +362,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
 }
 EXPORT_SYMBOL_GPL(gigaset_add_event);
-static void free_strings(struct at_state_t *at_state)
+static void clear_at_state(struct at_state_t *at_state)
 {
        int i;
@@ -372,18 +372,13 @@ static void free_strings(struct at_state_t *at_state)
        }
 }
-static void clear_at_state(struct at_state_t *at_state)
+static void dealloc_temp_at_states(struct cardstate *cs)
-{
-        free_strings(at_state);
-}
-static void dealloc_at_states(struct cardstate *cs)
 {
        struct at_state_t *cur, *next;
        list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) {
                list_del(&cur->list);
-                free_strings(cur);
+                clear_at_state(cur);
                kfree(cur);
        }
 }
@@ -393,8 +388,7 @@ static void gigaset_freebcs(struct bc_state *bcs)
        int i;
        gig_dbg(DEBUG_INIT, "freeing bcs[%d]->hw", bcs->channel);
-        if (!bcs->cs->ops->freebcshw(bcs))
+        bcs->cs->ops->freebcshw(bcs);
-                gig_dbg(DEBUG_INIT, "failed");
        gig_dbg(DEBUG_INIT, "clearing bcs[%d]->at_state", bcs->channel);
        clear_at_state(&bcs->at_state);
@@ -512,7 +506,7 @@ void gigaset_freecs(struct cardstate *cs)
        case 1: /* error when registering to LL */
                gig_dbg(DEBUG_INIT, "clearing at_state");
                clear_at_state(&cs->at_state);
-                dealloc_at_states(cs);
+                dealloc_temp_at_states(cs);
                /* fall through */
        case 0: /* error in basic setup */
@@ -571,6 +565,8 @@ static void gigaset_inbuf_init(struct inbuf_t *inbuf, struct cardstate *cs)
 * @inbuf:      buffer structure.
 * @src:        received data.
 * @numbytes:   number of bytes received.
+ *
+ * Return value: !=0 if some data was appended
 */
 int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
                       unsigned numbytes)
@@ -614,8 +610,8 @@ int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
 EXPORT_SYMBOL_GPL(gigaset_fill_inbuf);
 /* Initialize the b-channel structure */
-static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
+static int gigaset_initbcs(struct bc_state *bcs, struct cardstate *cs,
-                                        struct cardstate *cs, int channel)
+                           int channel)
 {
        int i;
@@ -654,11 +650,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
        bcs->apconnstate = 0;
        gig_dbg(DEBUG_INIT, "  setting up bcs[%d]->hw", channel);
-        if (cs->ops->initbcshw(bcs))
+        return cs->ops->initbcshw(bcs);
-                return bcs;
-        gig_dbg(DEBUG_INIT, "  failed");
-        return NULL;
 }
 /**
@@ -757,7 +749,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        cs->cmdbytes = 0;
        gig_dbg(DEBUG_INIT, "setting up iif");
-        if (!gigaset_isdn_regdev(cs, modulename)) {
+        if (gigaset_isdn_regdev(cs, modulename) < 0) {
                pr_err("error registering ISDN device\n");
                goto error;
        }
@@ -765,7 +757,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        make_valid(cs, VALID_ID);
        ++cs->cs_init;
        gig_dbg(DEBUG_INIT, "setting up hw");
-        if (!cs->ops->initcshw(cs))
+        if (cs->ops->initcshw(cs) < 0)
                goto error;
        ++cs->cs_init;
@@ -779,7 +771,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        /* set up channel data structures */
        for (i = 0; i < channels; ++i) {
                gig_dbg(DEBUG_INIT, "setting up bcs[%d]", i);
-                if (!gigaset_initbcs(cs->bcs + i, cs, i)) {
+                if (gigaset_initbcs(cs->bcs + i, cs, i) < 0) {
                        pr_err("could not allocate channel %d data\n", i);
                        goto error;
                }
@@ -848,8 +840,7 @@ static void cleanup_cs(struct cardstate *cs)
        cs->mstate = MS_UNINITIALIZED;
        clear_at_state(&cs->at_state);
-        dealloc_at_states(cs);
+        dealloc_temp_at_states(cs);
-        free_strings(&cs->at_state);
        gigaset_at_init(&cs->at_state, NULL, cs, 0);
        cs->inbuf->inputstate = INS_command;
@@ -875,7 +866,7 @@ static void cleanup_cs(struct cardstate *cs)
        for (i = 0; i < cs->channels; ++i) {
                gigaset_freebcs(cs->bcs + i);
-                if (!gigaset_initbcs(cs->bcs + i, cs, i))
+                if (gigaset_initbcs(cs->bcs + i, cs, i) < 0)
                        pr_err("could not allocate channel %d data\n", i);
        }
@@ -896,14 +887,14 @@ static void cleanup_cs(struct cardstate *cs)
 * waiting for completion of the initialization.
 *
 * Return value:
- *      1 - success, 0 - error
+ *      0 on success, error code < 0 on failure
 */
 int gigaset_start(struct cardstate *cs)
 {
        unsigned long flags;
        if (mutex_lock_interruptible(&cs->mutex))
-                return 0;
+                return -EBUSY;
        spin_lock_irqsave(&cs->lock, flags);
        cs->connected = 1;
@@ -927,11 +918,11 @@ int gigaset_start(struct cardstate *cs)
        wait_event(cs->waitqueue, !cs->waiting);
        mutex_unlock(&cs->mutex);
-        return 1;
+        return 0;
 error:
        mutex_unlock(&cs->mutex);
-        return 0;
+        return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(gigaset_start);
@@ -943,7 +934,7 @@ EXPORT_SYMBOL_GPL(gigaset_start);
 * waiting for completion of the shutdown.
 *
 * Return value:
- *      0 - success, -1 - error (no device associated)
+ *      0 - success, -ENODEV - error (no device associated)
 */
 int gigaset_shutdown(struct cardstate *cs)
 {
@@ -951,7 +942,7 @@ int gigaset_shutdown(struct cardstate *cs)
        if (!(cs->flags & VALID_MINOR)) {
                mutex_unlock(&cs->mutex);
-                return -1;
+                return -ENODEV;
        }
        cs->waiting = 1;
diff --git a/drivers/isdn/gigaset/dummyll.c b/drivers/isdn/gigaset/dummyll.c
index 19b1c779d50f..570c2d53b84e 100644
--- a/drivers/isdn/gigaset/dummyll.c
+++ b/drivers/isdn/gigaset/dummyll.c
@@ -60,7 +60,7 @@ void gigaset_isdn_stop(struct cardstate *cs)
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
-        return 1;
+        return 0;
 }
 void gigaset_isdn_unregdev(struct cardstate *cs)
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index 624a8256a77f..2e6963dc740e 100644
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -153,103 +153,104 @@ struct reply_t gigaset_tab_nocid[] =
 * action, command */
 /* initialize device, set cid mode if possible */
-        {RSP_INIT,       -1,  -1, SEQ_INIT,             100,  1, {ACT_TIMEOUT} },
+        {RSP_INIT,       -1,  -1, SEQ_INIT,     100,  1, {ACT_TIMEOUT} },
-        {EV_TIMEOUT,    100, 100, -1,                   101,  3, {0},   "Z\r"},
+        {EV_TIMEOUT,    100, 100, -1,           101,  3, {0},   "Z\r"},
-        {RSP_OK,        101, 103, -1,                   120,  5, {ACT_GETSTRING},
+        {RSP_OK,        101, 103, -1,           120,  5, {ACT_GETSTRING},
-         "+GMR\r"},
+                                                                "+GMR\r"},
-        {EV_TIMEOUT,    101, 101, -1,                   102,  5, {0},   "Z\r"},
+        {EV_TIMEOUT,    101, 101, -1,           102,  5, {0},   "Z\r"},
-        {RSP_ERROR,     101, 101, -1,                   102,  5, {0},   "Z\r"},
+        {RSP_ERROR,     101, 101, -1,           102,  5, {0},   "Z\r"},
-        {EV_TIMEOUT,    102, 102, -1,                   108,  5, {ACT_SETDLE1},
+        {EV_TIMEOUT,    102, 102, -1,           108,  5, {ACT_SETDLE1},
-         "^SDLE=0\r"},
+                                                                "^SDLE=0\r"},
-        {RSP_OK,        108, 108, -1,                   104, -1},
+        {RSP_OK,        108, 108, -1,           104, -1},
-        {RSP_ZDLE,      104, 104,  0,                   103,  5, {0},   "Z\r"},
+        {RSP_ZDLE,      104, 104,  0,           103,  5, {0},   "Z\r"},
-        {EV_TIMEOUT,    104, 104, -1,                     0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    104, 104, -1,             0,  0, {ACT_FAILINIT} },
-        {RSP_ERROR,     108, 108, -1,                     0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     108, 108, -1,             0,  0, {ACT_FAILINIT} },
-        {EV_TIMEOUT,    108, 108, -1,                   105,  2, {ACT_SETDLE0,
+        {EV_TIMEOUT,    108, 108, -1,           105,  2, {ACT_SETDLE0,
-                                                                  ACT_HUPMODEM,
+                                                          ACT_HUPMODEM,
-                                                                  ACT_TIMEOUT} },
+                                                          ACT_TIMEOUT} },
-        {EV_TIMEOUT,    105, 105, -1,                   103,  5, {0},   "Z\r"},
+        {EV_TIMEOUT,    105, 105, -1,           103,  5, {0},   "Z\r"},
-        {RSP_ERROR,     102, 102, -1,                   107,  5, {0},   "^GETPRE\r"},
+        {RSP_ERROR,     102, 102, -1,           107,  5, {0},   "^GETPRE\r"},
-        {RSP_OK,        107, 107, -1,                     0,  0, {ACT_CONFIGMODE} },
+        {RSP_OK,        107, 107, -1,             0,  0, {ACT_CONFIGMODE} },
-        {RSP_ERROR,     107, 107, -1,                     0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     107, 107, -1,             0,  0, {ACT_FAILINIT} },
-        {EV_TIMEOUT,    107, 107, -1,                     0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    107, 107, -1,             0,  0, {ACT_FAILINIT} },
-        {RSP_ERROR,     103, 103, -1,                     0,  0, {ACT_FAILINIT} },
+        {RSP_ERROR,     103, 103, -1,             0,  0, {ACT_FAILINIT} },
-        {EV_TIMEOUT,    103, 103, -1,                     0,  0, {ACT_FAILINIT} },
+        {EV_TIMEOUT,    103, 103, -1,             0,  0, {ACT_FAILINIT} },
-        {RSP_STRING,    120, 120, -1,                   121, -1, {ACT_SETVER} },
+        {RSP_STRING,    120, 120, -1,           121, -1, {ACT_SETVER} },
-        {EV_TIMEOUT,    120, 121, -1,                     0,  0, {ACT_FAILVER,
+        {EV_TIMEOUT,    120, 121, -1,             0,  0, {ACT_FAILVER,
-                                                                  ACT_INIT} },
+                                                          ACT_INIT} },
-        {RSP_ERROR,     120, 121, -1,                     0,  0, {ACT_FAILVER,
+        {RSP_ERROR,     120, 121, -1,             0,  0, {ACT_FAILVER,
-                                                                  ACT_INIT} },
+                                                          ACT_INIT} },
-        {RSP_OK,        121, 121, -1,                     0,  0, {ACT_GOTVER,
+        {RSP_OK,        121, 121, -1,             0,  0, {ACT_GOTVER,
-                                                                  ACT_INIT} },
+                                                          ACT_INIT} },
+        {RSP_NONE,      121, 121, -1,           120,  0, {ACT_GETSTRING} },
 /* leave dle mode */
-        {RSP_INIT,        0,   0, SEQ_DLE0,             201,  5, {0},   "^SDLE=0\r"},
+        {RSP_INIT,        0,   0, SEQ_DLE0,     201,  5, {0},   "^SDLE=0\r"},
-        {RSP_OK,        201, 201, -1,                   202, -1},
+        {RSP_OK,        201, 201, -1,           202, -1},
-        {RSP_ZDLE,      202, 202,  0,                     0,  0, {ACT_DLE0} },
+        {RSP_ZDLE,      202, 202,  0,             0,  0, {ACT_DLE0} },
-        {RSP_NODEV,     200, 249, -1,                     0,  0, {ACT_FAKEDLE0} },
+        {RSP_NODEV,     200, 249, -1,             0,  0, {ACT_FAKEDLE0} },
-        {RSP_ERROR,     200, 249, -1,                     0,  0, {ACT_FAILDLE0} },
+        {RSP_ERROR,     200, 249, -1,             0,  0, {ACT_FAILDLE0} },
-        {EV_TIMEOUT,    200, 249, -1,                     0,  0, {ACT_FAILDLE0} },
+        {EV_TIMEOUT,    200, 249, -1,             0,  0, {ACT_FAILDLE0} },
 /* enter dle mode */
-        {RSP_INIT,        0,   0, SEQ_DLE1,             251,  5, {0},   "^SDLE=1\r"},
+        {RSP_INIT,        0,   0, SEQ_DLE1,     251,  5, {0},   "^SDLE=1\r"},
-        {RSP_OK,        251, 251, -1,                   252, -1},
+        {RSP_OK,        251, 251, -1,           252, -1},
-        {RSP_ZDLE,      252, 252,  1,                     0,  0, {ACT_DLE1} },
+        {RSP_ZDLE,      252, 252,  1,             0,  0, {ACT_DLE1} },
-        {RSP_ERROR,     250, 299, -1,                     0,  0, {ACT_FAILDLE1} },
+        {RSP_ERROR,     250, 299, -1,             0,  0, {ACT_FAILDLE1} },
-        {EV_TIMEOUT,    250, 299, -1,                     0,  0, {ACT_FAILDLE1} },
+        {EV_TIMEOUT,    250, 299, -1,             0,  0, {ACT_FAILDLE1} },
 /* incoming call */
-        {RSP_RING,       -1,  -1, -1,                    -1, -1, {ACT_RING} },
+        {RSP_RING,       -1,  -1, -1,            -1, -1, {ACT_RING} },
 /* get cid */
-        {RSP_INIT,        0,   0, SEQ_CID,              301,  5, {0},   "^SGCI?\r"},
+        {RSP_INIT,        0,   0, SEQ_CID,      301,  5, {0},   "^SGCI?\r"},
-        {RSP_OK,        301, 301, -1,                   302, -1},
+        {RSP_OK,        301, 301, -1,           302, -1},
-        {RSP_ZGCI,      302, 302, -1,                     0,  0, {ACT_CID} },
+        {RSP_ZGCI,      302, 302, -1,             0,  0, {ACT_CID} },
-        {RSP_ERROR,     301, 349, -1,                     0,  0, {ACT_FAILCID} },
+        {RSP_ERROR,     301, 349, -1,             0,  0, {ACT_FAILCID} },
-        {EV_TIMEOUT,    301, 349, -1,                     0,  0, {ACT_FAILCID} },
+        {EV_TIMEOUT,    301, 349, -1,             0,  0, {ACT_FAILCID} },
 /* enter cid mode */
-        {RSP_INIT,        0,   0, SEQ_CIDMODE,          150,  5, {0},   "^SGCI=1\r"},
+        {RSP_INIT,        0,   0, SEQ_CIDMODE,  150,  5, {0},   "^SGCI=1\r"},
-        {RSP_OK,        150, 150, -1,                     0,  0, {ACT_CMODESET} },
+        {RSP_OK,        150, 150, -1,             0,  0, {ACT_CMODESET} },
-        {RSP_ERROR,     150, 150, -1,                     0,  0, {ACT_FAILCMODE} },
+        {RSP_ERROR,     150, 150, -1,             0,  0, {ACT_FAILCMODE} },
-        {EV_TIMEOUT,    150, 150, -1,                     0,  0, {ACT_FAILCMODE} },
+        {EV_TIMEOUT,    150, 150, -1,             0,  0, {ACT_FAILCMODE} },
 /* leave cid mode */
-        {RSP_INIT,        0,   0, SEQ_UMMODE,           160,  5, {0},   "Z\r"},
+        {RSP_INIT,        0,   0, SEQ_UMMODE,   160,  5, {0},   "Z\r"},
-        {RSP_OK,        160, 160, -1,                     0,  0, {ACT_UMODESET} },
+        {RSP_OK,        160, 160, -1,             0,  0, {ACT_UMODESET} },
-        {RSP_ERROR,     160, 160, -1,                     0,  0, {ACT_FAILUMODE} },
+        {RSP_ERROR,     160, 160, -1,             0,  0, {ACT_FAILUMODE} },
-        {EV_TIMEOUT,    160, 160, -1,                     0,  0, {ACT_FAILUMODE} },
+        {EV_TIMEOUT,    160, 160, -1,             0,  0, {ACT_FAILUMODE} },
 /* abort getting cid */
-        {RSP_INIT,        0,   0, SEQ_NOCID,              0,  0, {ACT_ABORTCID} },
+        {RSP_INIT,        0,   0, SEQ_NOCID,      0,  0, {ACT_ABORTCID} },
 /* reset */
-        {RSP_INIT,        0,   0, SEQ_SHUTDOWN,         504,  5, {0},   "Z\r"},
+        {RSP_INIT,        0,   0, SEQ_SHUTDOWN, 504,  5, {0},   "Z\r"},
-        {RSP_OK,        504, 504, -1,                     0,  0, {ACT_SDOWN} },
+        {RSP_OK,        504, 504, -1,             0,  0, {ACT_SDOWN} },
-        {RSP_ERROR,     501, 599, -1,                     0,  0, {ACT_FAILSDOWN} },
+        {RSP_ERROR,     501, 599, -1,             0,  0, {ACT_FAILSDOWN} },
-        {EV_TIMEOUT,    501, 599, -1,                     0,  0, {ACT_FAILSDOWN} },
+        {EV_TIMEOUT,    501, 599, -1,             0,  0, {ACT_FAILSDOWN} },
-        {RSP_NODEV,     501, 599, -1,                     0,  0, {ACT_FAKESDOWN} },
+        {RSP_NODEV,     501, 599, -1,             0,  0, {ACT_FAKESDOWN} },
-        {EV_PROC_CIDMODE, -1, -1, -1,                    -1, -1, {ACT_PROC_CIDMODE} },
+        {EV_PROC_CIDMODE, -1, -1, -1,            -1, -1, {ACT_PROC_CIDMODE} },
-        {EV_IF_LOCK,     -1,  -1, -1,                    -1, -1, {ACT_IF_LOCK} },
+        {EV_IF_LOCK,     -1,  -1, -1,            -1, -1, {ACT_IF_LOCK} },
-        {EV_IF_VER,      -1,  -1, -1,                    -1, -1, {ACT_IF_VER} },
+        {EV_IF_VER,      -1,  -1, -1,            -1, -1, {ACT_IF_VER} },
-        {EV_START,       -1,  -1, -1,                    -1, -1, {ACT_START} },
+        {EV_START,       -1,  -1, -1,            -1, -1, {ACT_START} },
-        {EV_STOP,        -1,  -1, -1,                    -1, -1, {ACT_STOP} },
+        {EV_STOP,        -1,  -1, -1,            -1, -1, {ACT_STOP} },
-        {EV_SHUTDOWN,    -1,  -1, -1,                    -1, -1, {ACT_SHUTDOWN} },
+        {EV_SHUTDOWN,    -1,  -1, -1,            -1, -1, {ACT_SHUTDOWN} },
 /* misc. */
-        {RSP_ERROR,      -1,  -1, -1,                    -1, -1, {ACT_ERROR} },
+        {RSP_ERROR,      -1,  -1, -1,            -1, -1, {ACT_ERROR} },
-        {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
+        {RSP_ZCAU,       -1,  -1, -1,            -1, -1, {ACT_ZCAU} },
-        {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
+        {RSP_NONE,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
-        {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
+        {RSP_ANY,        -1,  -1, -1,            -1, -1, {ACT_WARN} },
        {RSP_LAST}
 };
@@ -261,90 +262,90 @@ struct reply_t gigaset_tab_cid[] =
 * action, command */
 /* dial */
-        {EV_DIAL,        -1,  -1, -1,                    -1, -1, {ACT_DIAL} },
+        {EV_DIAL,        -1,  -1, -1,            -1, -1, {ACT_DIAL} },
-        {RSP_INIT,        0,   0, SEQ_DIAL,             601,  5, {ACT_CMD + AT_BC} },
+        {RSP_INIT,        0,   0, SEQ_DIAL,     601,  5, {ACT_CMD + AT_BC} },
-        {RSP_OK,        601, 601, -1,                   603,  5, {ACT_CMD + AT_PROTO} },
+        {RSP_OK,        601, 601, -1,           603,  5, {ACT_CMD + AT_PROTO} },
-        {RSP_OK,        603, 603, -1,                   604,  5, {ACT_CMD + AT_TYPE} },
+        {RSP_OK,        603, 603, -1,           604,  5, {ACT_CMD + AT_TYPE} },
-        {RSP_OK,        604, 604, -1,                   605,  5, {ACT_CMD + AT_MSN} },
+        {RSP_OK,        604, 604, -1,           605,  5, {ACT_CMD + AT_MSN} },
-        {RSP_NULL,      605, 605, -1,                   606,  5, {ACT_CMD + AT_CLIP} },
+        {RSP_NULL,      605, 605, -1,           606,  5, {ACT_CMD + AT_CLIP} },
-        {RSP_OK,        605, 605, -1,                   606,  5, {ACT_CMD + AT_CLIP} },
+        {RSP_OK,        605, 605, -1,           606,  5, {ACT_CMD + AT_CLIP} },
-        {RSP_NULL,      606, 606, -1,                   607,  5, {ACT_CMD + AT_ISO} },
+        {RSP_NULL,      606, 606, -1,           607,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        606, 606, -1,                   607,  5, {ACT_CMD + AT_ISO} },
+        {RSP_OK,        606, 606, -1,           607,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        607, 607, -1,                   608,  5, {0},   "+VLS=17\r"},
+        {RSP_OK,        607, 607, -1,           608,  5, {0},   "+VLS=17\r"},
-        {RSP_OK,        608, 608, -1,                   609, -1},
+        {RSP_OK,        608, 608, -1,           609, -1},
-        {RSP_ZSAU,      609, 609, ZSAU_PROCEEDING,      610,  5, {ACT_CMD + AT_DIAL} },
+        {RSP_ZSAU,      609, 609, ZSAU_PROCEEDING, 610, 5, {ACT_CMD + AT_DIAL} },
-        {RSP_OK,        610, 610, -1,                   650,  0, {ACT_DIALING} },
+        {RSP_OK,        610, 610, -1,           650,  0, {ACT_DIALING} },
-        {RSP_ERROR,     601, 610, -1,                     0,  0, {ACT_ABORTDIAL} },
+        {RSP_ERROR,     601, 610, -1,             0,  0, {ACT_ABORTDIAL} },
-        {EV_TIMEOUT,    601, 610, -1,                     0,  0, {ACT_ABORTDIAL} },
+        {EV_TIMEOUT,    601, 610, -1,             0,  0, {ACT_ABORTDIAL} },
 /* optional dialing responses */
-        {EV_BC_OPEN,    650, 650, -1,                   651, -1},
+        {EV_BC_OPEN,    650, 650, -1,           651, -1},
-        {RSP_ZVLS,      609, 651, 17,                    -1, -1, {ACT_DEBUG} },
+        {RSP_ZVLS,      609, 651, 17,            -1, -1, {ACT_DEBUG} },
-        {RSP_ZCTP,      610, 651, -1,                    -1, -1, {ACT_DEBUG} },
+        {RSP_ZCTP,      610, 651, -1,            -1, -1, {ACT_DEBUG} },
-        {RSP_ZCPN,      610, 651, -1,                    -1, -1, {ACT_DEBUG} },
+        {RSP_ZCPN,      610, 651, -1,            -1, -1, {ACT_DEBUG} },
-        {RSP_ZSAU,      650, 651, ZSAU_CALL_DELIVERED,   -1, -1, {ACT_DEBUG} },
+        {RSP_ZSAU,      650, 651, ZSAU_CALL_DELIVERED, -1, -1, {ACT_DEBUG} },
 /* connect */
-        {RSP_ZSAU,      650, 650, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT} },
+        {RSP_ZSAU,      650, 650, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT} },
-        {RSP_ZSAU,      651, 651, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT,
+        {RSP_ZSAU,      651, 651, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT,
-                                                                  ACT_NOTIFY_BC_UP} },
+                                                          ACT_NOTIFY_BC_UP} },
-        {RSP_ZSAU,      750, 750, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT} },
+        {RSP_ZSAU,      750, 750, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT} },
-        {RSP_ZSAU,      751, 751, ZSAU_ACTIVE,          800, -1, {ACT_CONNECT,
+        {RSP_ZSAU,      751, 751, ZSAU_ACTIVE,  800, -1, {ACT_CONNECT,
-                                                                  ACT_NOTIFY_BC_UP} },
+                                                          ACT_NOTIFY_BC_UP} },
-        {EV_BC_OPEN,    800, 800, -1,                   800, -1, {ACT_NOTIFY_BC_UP} },
+        {EV_BC_OPEN,    800, 800, -1,           800, -1, {ACT_NOTIFY_BC_UP} },
 /* remote hangup */
-        {RSP_ZSAU,      650, 651, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEREJECT} },
+        {RSP_ZSAU,      650, 651, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEREJECT} },
-        {RSP_ZSAU,      750, 751, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEHUP} },
+        {RSP_ZSAU,      750, 751, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEHUP} },
-        {RSP_ZSAU,      800, 800, ZSAU_DISCONNECT_IND,    0,  0, {ACT_REMOTEHUP} },
+        {RSP_ZSAU,      800, 800, ZSAU_DISCONNECT_IND, 0, 0, {ACT_REMOTEHUP} },
 /* hangup */
-        {EV_HUP,         -1,  -1, -1,                    -1, -1, {ACT_HUP} },
+        {EV_HUP,         -1,  -1, -1,            -1, -1, {ACT_HUP} },
-        {RSP_INIT,       -1,  -1, SEQ_HUP,              401,  5, {0},   "+VLS=0\r"},
+        {RSP_INIT,       -1,  -1, SEQ_HUP,      401,  5, {0},   "+VLS=0\r"},
-        {RSP_OK,        401, 401, -1,                   402,  5},
+        {RSP_OK,        401, 401, -1,           402,  5},
-        {RSP_ZVLS,      402, 402,  0,                   403,  5},
+        {RSP_ZVLS,      402, 402,  0,           403,  5},
-        {RSP_ZSAU,      403, 403, ZSAU_DISCONNECT_REQ,   -1, -1, {ACT_DEBUG} },
+        {RSP_ZSAU,      403, 403, ZSAU_DISCONNECT_REQ, -1, -1, {ACT_DEBUG} },
-        {RSP_ZSAU,      403, 403, ZSAU_NULL,              0,  0, {ACT_DISCONNECT} },
+        {RSP_ZSAU,      403, 403, ZSAU_NULL,      0,  0, {ACT_DISCONNECT} },
-        {RSP_NODEV,     401, 403, -1,                     0,  0, {ACT_FAKEHUP} },
+        {RSP_NODEV,     401, 403, -1,             0,  0, {ACT_FAKEHUP} },
-        {RSP_ERROR,     401, 401, -1,                     0,  0, {ACT_ABORTHUP} },
+        {RSP_ERROR,     401, 401, -1,             0,  0, {ACT_ABORTHUP} },
-        {EV_TIMEOUT,    401, 403, -1,                     0,  0, {ACT_ABORTHUP} },
+        {EV_TIMEOUT,    401, 403, -1,             0,  0, {ACT_ABORTHUP} },
-        {EV_BC_CLOSED,    0,   0, -1,                     0, -1, {ACT_NOTIFY_BC_DOWN} },
+        {EV_BC_CLOSED,    0,   0, -1,             0, -1, {ACT_NOTIFY_BC_DOWN} },
 /* ring */
-        {RSP_ZBC,       700, 700, -1,                    -1, -1, {0} },
+        {RSP_ZBC,       700, 700, -1,            -1, -1, {0} },
-        {RSP_ZHLC,      700, 700, -1,                    -1, -1, {0} },
+        {RSP_ZHLC,      700, 700, -1,            -1, -1, {0} },
-        {RSP_NMBR,      700, 700, -1,                    -1, -1, {0} },
+        {RSP_NMBR,      700, 700, -1,            -1, -1, {0} },
-        {RSP_ZCPN,      700, 700, -1,                    -1, -1, {0} },
+        {RSP_ZCPN,      700, 700, -1,            -1, -1, {0} },
-        {RSP_ZCTP,      700, 700, -1,                    -1, -1, {0} },
+        {RSP_ZCTP,      700, 700, -1,            -1, -1, {0} },
-        {EV_TIMEOUT,    700, 700, -1,                   720, 720, {ACT_ICALL} },
+        {EV_TIMEOUT,    700, 700, -1,           720, 720, {ACT_ICALL} },
-        {EV_BC_CLOSED,  720, 720, -1,                     0, -1, {ACT_NOTIFY_BC_DOWN} },
+        {EV_BC_CLOSED,  720, 720, -1,             0, -1, {ACT_NOTIFY_BC_DOWN} },
 /*accept icall*/
-        {EV_ACCEPT,      -1,  -1, -1,                    -1, -1, {ACT_ACCEPT} },
+        {EV_ACCEPT,      -1,  -1, -1,            -1, -1, {ACT_ACCEPT} },
-        {RSP_INIT,      720, 720, SEQ_ACCEPT,           721,  5, {ACT_CMD + AT_PROTO} },
+        {RSP_INIT,      720, 720, SEQ_ACCEPT,   721,  5, {ACT_CMD + AT_PROTO} },
-        {RSP_OK,        721, 721, -1,                   722,  5, {ACT_CMD + AT_ISO} },
+        {RSP_OK,        721, 721, -1,           722,  5, {ACT_CMD + AT_ISO} },
-        {RSP_OK,        722, 722, -1,                   723,  5, {0},   "+VLS=17\r"},
+        {RSP_OK,        722, 722, -1,           723,  5, {0},   "+VLS=17\r"},
-        {RSP_OK,        723, 723, -1,                   724,  5, {0} },
+        {RSP_OK,        723, 723, -1,           724,  5, {0} },
-        {RSP_ZVLS,      724, 724, 17,                   750, 50, {ACT_ACCEPTED} },
+        {RSP_ZVLS,      724, 724, 17,           750, 50, {ACT_ACCEPTED} },
-        {RSP_ERROR,     721, 729, -1,                     0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ERROR,     721, 729, -1,             0,  0, {ACT_ABORTACCEPT} },
-        {EV_TIMEOUT,    721, 729, -1,                     0,  0, {ACT_ABORTACCEPT} },
+        {EV_TIMEOUT,    721, 729, -1,             0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_NULL,              0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_NULL,      0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_ACTIVE,            0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_ACTIVE,    0,  0, {ACT_ABORTACCEPT} },
-        {RSP_ZSAU,      700, 729, ZSAU_DISCONNECT_IND,    0,  0, {ACT_ABORTACCEPT} },
+        {RSP_ZSAU,      700, 729, ZSAU_DISCONNECT_IND, 0, 0, {ACT_ABORTACCEPT} },
-        {EV_BC_OPEN,    750, 750, -1,                   751, -1},
+        {EV_BC_OPEN,    750, 750, -1,           751, -1},
-        {EV_TIMEOUT,    750, 751, -1,                     0,  0, {ACT_CONNTIMEOUT} },
+        {EV_TIMEOUT,    750, 751, -1,             0,  0, {ACT_CONNTIMEOUT} },
 /* B channel closed (general case) */
-        {EV_BC_CLOSED,   -1,  -1, -1,                    -1, -1, {ACT_NOTIFY_BC_DOWN} },
+        {EV_BC_CLOSED,   -1,  -1, -1,            -1, -1, {ACT_NOTIFY_BC_DOWN} },
 /* misc. */
-        {RSP_ZCON,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
+        {RSP_ZCON,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
-        {RSP_ZCAU,       -1,  -1, -1,                    -1, -1, {ACT_ZCAU} },
+        {RSP_ZCAU,       -1,  -1, -1,            -1, -1, {ACT_ZCAU} },
-        {RSP_NONE,       -1,  -1, -1,                    -1, -1, {ACT_DEBUG} },
+        {RSP_NONE,       -1,  -1, -1,            -1, -1, {ACT_DEBUG} },
-        {RSP_ANY,        -1,  -1, -1,                    -1, -1, {ACT_WARN} },
+        {RSP_ANY,        -1,  -1, -1,            -1, -1, {ACT_WARN} },
        {RSP_LAST}
 };
@@ -648,16 +649,16 @@ static void disconnect(struct at_state_t **at_state_p)
 static inline struct at_state_t *get_free_channel(struct cardstate *cs,
                                                  int cid)
 /* cids: >0: siemens-cid
-   0: without cid
+ *        0: without cid
-   -1: no cid assigned yet
+ *       -1: no cid assigned yet
-*/
+ */
 {
        unsigned long flags;
        int i;
        struct at_state_t *ret;
        for (i = 0; i < cs->channels; ++i)
-                if (gigaset_get_channel(cs->bcs + i)) {
+                if (gigaset_get_channel(cs->bcs + i) >= 0) {
                        ret = &cs->bcs[i].at_state;
                        ret->cid = cid;
                        return ret;
@@ -922,18 +923,18 @@ static void do_stop(struct cardstate *cs)
 * channel >= 0: getting cid for the channel failed
 * channel < 0:  entering cid mode failed
 *
- * returns 0 on failure
+ * returns 0 on success, <0 on failure
 */
 static int reinit_and_retry(struct cardstate *cs, int channel)
 {
        int i;
        if (--cs->retry_count <= 0)
-                return 0;
+                return -EFAULT;
        for (i = 0; i < cs->channels; ++i)
                if (cs->bcs[i].at_state.cid > 0)
-                        return 0;
+                        return -EBUSY;
        if (channel < 0)
                dev_warn(cs->dev,
@@ -944,7 +945,7 @@ static int reinit_and_retry(struct cardstate *cs, int channel)
                cs->bcs[channel].at_state.pending_commands |= PC_CID;
        }
        schedule_init(cs, MS_INIT);
-        return 1;
+        return 0;
 }
 static int at_state_invalid(struct cardstate *cs,
@@ -1015,7 +1016,7 @@ static int do_lock(struct cardstate *cs)
                        if (cs->bcs[i].at_state.pending_commands)
                                return -EBUSY;
-                if (!gigaset_get_channels(cs))
+                if (gigaset_get_channels(cs) < 0)
                        return -EBUSY;
                break;
@@ -1124,7 +1125,7 @@ static void do_action(int action, struct cardstate *cs,
                        init_failed(cs, M_UNKNOWN);
                        break;
                }
-                if (!reinit_and_retry(cs, -1))
+                if (reinit_and_retry(cs, -1) < 0)
                        schedule_init(cs, MS_RECOVER);
                break;
        case ACT_FAILUMODE:
@@ -1267,7 +1268,7 @@ static void do_action(int action, struct cardstate *cs,
        case ACT_FAILCID:
                cs->cur_at_seq = SEQ_NONE;
                channel = cs->curchannel;
-                if (!reinit_and_retry(cs, channel)) {
+                if (reinit_and_retry(cs, channel) < 0) {
                        dev_warn(cs->dev,
                                 "Could not get a call ID. Cannot dial.\n");
                        at_state2 = &cs->bcs[channel].at_state;
@@ -1314,8 +1315,9 @@ static void do_action(int action, struct cardstate *cs,
                s = ev->ptr;
                if (!strcmp(s, "OK")) {
+                        /* OK without version string: assume old response */
                        *p_genresp = 1;
-                        *p_resp_code = RSP_ERROR;
+                        *p_resp_code = RSP_NONE;
                        break;
                }
@@ -1372,7 +1374,8 @@ static void do_action(int action, struct cardstate *cs,
                         ev->parameter, at_state->ConState);
                break;
-                /* events from the LL */
+        /* events from the LL */
        case ACT_DIAL:
                start_dial(at_state, ev->ptr, ev->parameter);
                break;
@@ -1385,7 +1388,8 @@ static void do_action(int action, struct cardstate *cs,
                cs->commands_pending = 1;
                break;
-                /* hotplug events */
+        /* hotplug events */
        case ACT_STOP:
                do_stop(cs);
                break;
@@ -1393,7 +1397,8 @@ static void do_action(int action, struct cardstate *cs,
                do_start(cs);
                break;
-                /* events from the interface */
+        /* events from the interface */
        case ACT_IF_LOCK:
                cs->cmd_result = ev->parameter ? do_lock(cs) : do_unlock(cs);
                cs->waiting = 0;
@@ -1412,7 +1417,8 @@ static void do_action(int action, struct cardstate *cs,
                wake_up(&cs->waitqueue);
                break;
-                /* events from the proc file system */
+        /* events from the proc file system */
        case ACT_PROC_CIDMODE:
                spin_lock_irqsave(&cs->lock, flags);
                if (ev->parameter != cs->cidmode) {
@@ -1431,7 +1437,8 @@ static void do_action(int action, struct cardstate *cs,
                wake_up(&cs->waitqueue);
                break;
-                /* events from the hardware drivers */
+        /* events from the hardware drivers */
        case ACT_NOTIFY_BC_DOWN:
                bchannel_down(bcs);
                break;
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 1dc25131e670..8e2fc8f31d16 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -163,8 +163,8 @@ void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
 #define BAS_LOWFRAME    5       /* "    "    with negative flow control */
 #define BAS_CORRFRAMES  4       /* flow control multiplicator */
-#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)
+#define BAS_INBUFSIZE   (BAS_MAXFRAME * BAS_NUMFRAMES)  /* size of isoc in buf
-/* size of isoc in buf per URB */
+                                                         * per URB */
 #define BAS_OUTBUFSIZE  4096            /* size of common isoc out buffer */
 #define BAS_OUTBUFPAD   BAS_MAXFRAME    /* size of pad area for isoc out buf */
@@ -471,18 +471,18 @@ struct cardstate {
                                           for */
        int commands_pending;           /* flag(s) in xxx.commands_pending have
                                           been set */
-        struct tasklet_struct event_tasklet;
+        struct tasklet_struct
-        /* tasklet for serializing AT commands.
+                event_tasklet;          /* tasklet for serializing AT commands.
-         * Scheduled
+                                         * Scheduled
-         *   -> for modem reponses (and
+                                         *   -> for modem reponses (and
-         *      incoming data for M10x)
+                                         *      incoming data for M10x)
-         *   -> on timeout
+                                         *   -> on timeout
-         *   -> after setting bits in
+                                         *   -> after setting bits in
-         *      xxx.at_state.pending_command
+                                         *      xxx.at_state.pending_command
-         *      (e.g. command from LL) */
+                                         *      (e.g. command from LL) */
-        struct tasklet_struct write_tasklet;
+        struct tasklet_struct
-        /* tasklet for serial output
+                write_tasklet;          /* tasklet for serial output
-         * (not used in base driver) */
+                                         * (not used in base driver) */
        /* event queue */
        struct event_t events[MAX_EVENTS];
@@ -583,7 +583,7 @@ struct gigaset_ops {
        int (*initbcshw)(struct bc_state *bcs);
        /* Called by gigaset_freecs() for freeing bcs->hw.xxx */
-        int (*freebcshw)(struct bc_state *bcs);
+        void (*freebcshw)(struct bc_state *bcs);
        /* Called by gigaset_bchannel_down() for resetting bcs->hw.xxx */
        void (*reinitbcshw)(struct bc_state *bcs);
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index 0f13eb1de657..2d75329007f1 100644
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -229,7 +229,7 @@ static int command_from_LL(isdn_ctrl *cntrl)
                        return -EINVAL;
                }
                bcs = cs->bcs + ch;
-                if (!gigaset_get_channel(bcs)) {
+                if (gigaset_get_channel(bcs) < 0) {
                        dev_err(cs->dev, "ISDN_CMD_DIAL: channel not free\n");
                        return -EBUSY;
                }
@@ -618,7 +618,7 @@ void gigaset_isdn_stop(struct cardstate *cs)
 * @cs:         device descriptor structure.
 * @isdnid:     device name.
 *
- * Return value: 1 for success, 0 for failure
+ * Return value: 0 on success, error code < 0 on failure
 */
 int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
 {
@@ -627,14 +627,14 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        iif = kmalloc(sizeof *iif, GFP_KERNEL);
        if (!iif) {
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        if (snprintf(iif->id, sizeof iif->id, "%s_%u", isdnid, cs->minor_index)
            >= sizeof iif->id) {
                pr_err("ID too long: %s\n", isdnid);
                kfree(iif);
-                return 0;
+                return -EINVAL;
        }
        iif->owner = THIS_MODULE;
@@ -656,13 +656,13 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        if (!register_isdn(iif)) {
                pr_err("register_isdn failed\n");
                kfree(iif);
-                return 0;
+                return -EINVAL;
        }
        cs->iif = iif;
        cs->myid = iif->channels;               /* Set my device id */
        cs->hw_hdr_len = HW_HDR_LEN;
-        return 1;
+        return 0;
 }
 /**
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index a351c16705bd..bc29f1d52a2f 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -56,7 +56,7 @@ static inline int isowbuf_freebytes(struct isowbuf_t *iwb)
 /* start writing
 * acquire the write semaphore
- * return true if acquired, false if busy
+ * return 0 if acquired, <0 if busy
 */
 static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
 {
@@ -64,12 +64,12 @@ static inline int isowbuf_startwrite(struct isowbuf_t *iwb)
                atomic_inc(&iwb->writesem);
                gig_dbg(DEBUG_ISO, "%s: couldn't acquire iso write semaphore",
                        __func__);
-                return 0;
+                return -EBUSY;
        }
        gig_dbg(DEBUG_ISO,
                "%s: acquired iso write semaphore, data[write]=%02x, nbits=%d",
                __func__, iwb->data[iwb->write], iwb->wbits);
-        return 1;
+        return 0;
 }
 /* finish writing
@@ -158,7 +158,7 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
                /* no wraparound in valid data */
                if (limit >= write) {
                        /* append idle frame */
-                        if (!isowbuf_startwrite(iwb))
+                        if (isowbuf_startwrite(iwb) < 0)
                                return -EBUSY;
                        /* write position could have changed */
                        write = iwb->write;
@@ -403,7 +403,7 @@ static inline int hdlc_buildframe(struct isowbuf_t *iwb,
        unsigned char c;
        if (isowbuf_freebytes(iwb) < count + count / 5 + 6 ||
-            !isowbuf_startwrite(iwb)) {
+            isowbuf_startwrite(iwb) < 0) {
                gig_dbg(DEBUG_ISO, "%s: %d bytes free -> -EAGAIN",
                        __func__, isowbuf_freebytes(iwb));
                return -EAGAIN;
@@ -457,7 +457,7 @@ static inline int trans_buildframe(struct isowbuf_t *iwb,
                return iwb->write;
        if (isowbuf_freebytes(iwb) < count ||
-            !isowbuf_startwrite(iwb)) {
+            isowbuf_startwrite(iwb) < 0) {
                gig_dbg(DEBUG_ISO, "can't put %d bytes", count);
                return -EAGAIN;
        }
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 6f3fd4cf4378..8c91fd5eb6fd 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -340,17 +340,16 @@ static int gigaset_initbcshw(struct bc_state *bcs)
 {
        /* unused */
        bcs->hw.ser = NULL;
-        return 1;
+        return 0;
 }
 /*
 * Free B channel structure
 * Called by "gigaset_freebcs" in common.c
 */
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
        /* unused */
-        return 1;
 }
 /*
@@ -398,7 +397,7 @@ static int gigaset_initcshw(struct cardstate *cs)
        scs = kzalloc(sizeof(struct ser_cardstate), GFP_KERNEL);
        if (!scs) {
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        cs->hw.ser = scs;
@@ -410,13 +409,13 @@ static int gigaset_initcshw(struct cardstate *cs)
                pr_err("error %d registering platform device\n", rc);
                kfree(cs->hw.ser);
                cs->hw.ser = NULL;
-                return 0;
+                return rc;
        }
        dev_set_drvdata(&cs->hw.ser->dev.dev, cs);
        tasklet_init(&cs->write_tasklet,
                     gigaset_modem_fill, (unsigned long) cs);
-        return 1;
+        return 0;
 }
 /*
@@ -503,6 +502,7 @@ static int
 gigaset_tty_open(struct tty_struct *tty)
 {
        struct cardstate *cs;
+        int rc;
        gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
@@ -515,8 +515,10 @@ gigaset_tty_open(struct tty_struct *tty)
        /* allocate memory for our device state and initialize it */
        cs = gigaset_initcs(driver, 1, 1, 0, cidmode, GIGASET_MODULENAME);
-        if (!cs)
+        if (!cs) {
+                rc = -ENODEV;
                goto error;
+        }
        cs->dev = &cs->hw.ser->dev.dev;
        cs->hw.ser->tty = tty;
@@ -530,7 +532,8 @@ gigaset_tty_open(struct tty_struct *tty)
         */
        if (startmode == SM_LOCKED)
                cs->mstate = MS_LOCKED;
-        if (!gigaset_start(cs)) {
+        rc = gigaset_start(cs);
+        if (rc < 0) {
                tasklet_kill(&cs->write_tasklet);
                goto error;
        }
@@ -542,7 +545,7 @@ error:
        gig_dbg(DEBUG_INIT, "Startup of HLL failed");
        tty->disc_data = NULL;
        gigaset_freecs(cs);
-        return -ENODEV;
+        return rc;
 }
 /*
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 049da67f6392..bb12d8051732 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -549,10 +549,9 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
                               0, 0, &buf, 6, 2000);
 }
-static int gigaset_freebcshw(struct bc_state *bcs)
+static void gigaset_freebcshw(struct bc_state *bcs)
 {
        /* unused */
-        return 1;
 }
 /* Initialize the b-channel structure */
@@ -560,7 +559,7 @@ static int gigaset_initbcshw(struct bc_state *bcs)
 {
        /* unused */
        bcs->hw.usb = NULL;
-        return 1;
+        return 0;
 }
 static void gigaset_reinitbcshw(struct bc_state *bcs)
@@ -582,7 +581,7 @@ static int gigaset_initcshw(struct cardstate *cs)
                kmalloc(sizeof(struct usb_cardstate), GFP_KERNEL);
        if (!ucs) {
                pr_err("out of memory\n");
-                return 0;
+                return -ENOMEM;
        }
        ucs->bchars[0] = 0;
@@ -597,7 +596,7 @@ static int gigaset_initcshw(struct cardstate *cs)
        tasklet_init(&cs->write_tasklet,
                     gigaset_modem_fill, (unsigned long) cs);
-        return 1;
+        return 0;
 }
 /* Send data from current skb to the device. */
@@ -766,9 +765,9 @@ static int gigaset_probe(struct usb_interface *interface,
        if (startmode == SM_LOCKED)
                cs->mstate = MS_LOCKED;
-        if (!gigaset_start(cs)) {
+        retval = gigaset_start(cs);
+        if (retval < 0) {
                tasklet_kill(&cs->write_tasklet);
-                retval = -ENODEV;
                goto error;
        }
        return 0;
@@ -898,8 +897,10 @@ static int __init usb_gigaset_init(void)
        driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
                                    GIGASET_MODULENAME, GIGASET_DEVNAME,
                                    &ops, THIS_MODULE);
-        if (driver == NULL)
+        if (driver == NULL) {
+                result = -ENOMEM;
                goto error;
+        }
        /* register this driver with the USB subsystem */
        result = usb_register(&gigaset_usb_driver);
@@ -915,7 +916,7 @@ error:
        if (driver)
                gigaset_freedriver(driver);
        driver = NULL;
-        return -1;
+        return result;
 }
 /*
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index c0b8c960ee3f..6bf2c58795a3 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -868,7 +868,7 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_LOOP:
                /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -878,6 +878,9 @@ channel_ctrl(struct fritzcard  *fc, struct mISDN_ctrl_req *cq)
                }
                ret = fc->isac.ctrl(&fc->isac, HW_TESTLOOP, cq->channel);
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = fc->isac.ctrl(&fc->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
        default:
                pr_info("%s: %s unknown Op %x\n", fc->name, __func__, cq->op);
                ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 43013316b9b0..4c128e4bb5cf 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -4161,7 +4161,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_HFC_OP;
+                cq->op = MISDN_CTRL_HFC_OP | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_HFC_WD_INIT: /* init the watchdog */
                wd_cnt = cq->p1 & 0xf;
@@ -4191,6 +4191,9 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
                               __func__);
                HFC_outb(hc, R_BERT_WD_MD, hc->hw.r_bert_wd_md | V_WD_RES);
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(dch->l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
        default:
                printk(KERN_WARNING "%s: unknown Op %x\n",
                       __func__, cq->op);
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index e2c83a2d7691..5fe993e2dee9 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1819,7 +1819,7 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_CONNECT |
-                        MISDN_CTRL_DISCONNECT;
+                         MISDN_CTRL_DISCONNECT | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_LOOP:
                /* channel 0 disabled loop */
@@ -1896,6 +1896,9 @@ channel_ctrl(struct hfc_pci *hc, struct mISDN_ctrl_req *cq)
                Write_hfc(hc, HFCPCI_CONNECT, hc->hw.conn);
                hc->hw.trm &= 0x7f;     /* disable IOM-loop */
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(hc->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
+                break;
        default:
                printk(KERN_WARNING "%s: unknown Op %x\n",
                       __func__, cq->op);
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 884369f09cad..92d4a78bc0a5 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -603,10 +603,11 @@ isac_l1hw(struct mISDNchannel *ch, struct sk_buff *skb)
 }
 static int
-isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
+isac_ctrl(struct isac_hw *isac, u32 cmd, unsigned long para)
 {
        u8 tl = 0;
-        u_long flags;
+        unsigned long flags;
+        int ret = 0;
        switch (cmd) {
        case HW_TESTLOOP:
@@ -626,12 +627,15 @@ isac_ctrl(struct isac_hw *isac, u32 cmd, u_long para)
                }
                spin_unlock_irqrestore(isac->hwlock, flags);
                break;
+        case HW_TIMER3_VALUE:
+                ret = l1_event(isac->dch.l1, HW_TIMER3_VALUE | (para & 0xff));
+                break;
        default:
                pr_debug("%s: %s unknown command %x %lx\n", isac->name,
                         __func__, cmd, para);
-                return -1;
+                ret = -1;
        }
-        return 0;
+        return ret;
 }
 static int
@@ -1526,7 +1530,7 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_LOOP:
                /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -1536,6 +1540,9 @@ channel_ctrl(struct ipac_hw *ipac, struct mISDN_ctrl_req *cq)
                }
                ret = ipac->ctrl(ipac, HW_TESTLOOP, cq->channel);
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = ipac->isac.ctrl(&ipac->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
        default:
                pr_info("%s: unknown CTRL OP %x\n", ipac->name, cq->op);
                ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index c726e09d0981..27998d7188a5 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -837,7 +837,7 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_LOOP:
                /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -847,6 +847,9 @@ channel_ctrl(struct tiger_hw *card, struct mISDN_ctrl_req *cq)
                }
                ret = card->isac.ctrl(&card->isac, HW_TESTLOOP, cq->channel);
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = card->isac.ctrl(&card->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
        default:
                pr_info("%s: %s unknown Op %x\n", card->name, __func__, cq->op);
                ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c
index 04689935148b..93f344d74e54 100644
--- a/drivers/isdn/hardware/mISDN/speedfax.c
+++ b/drivers/isdn/hardware/mISDN/speedfax.c
@@ -224,7 +224,7 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = MISDN_CTRL_LOOP;
+                cq->op = MISDN_CTRL_LOOP | MISDN_CTRL_L1_TIMER3;
                break;
        case MISDN_CTRL_LOOP:
                /* cq->channel: 0 disable, 1 B1 loop 2 B2 loop, 3 both */
@@ -234,6 +234,9 @@ channel_ctrl(struct sfax_hw  *sf, struct mISDN_ctrl_req *cq)
                }
                ret = sf->isac.ctrl(&sf->isac, HW_TESTLOOP, cq->channel);
                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = sf->isac.ctrl(&sf->isac, HW_TIMER3_VALUE, cq->p1);
+                break;
        default:
                pr_info("%s: unknown Op %x\n", sf->name, cq->op);
                ret = -EINVAL;
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 2183357f0799..1d044670ff66 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -1035,7 +1035,10 @@ channel_ctrl(struct w6692_hw *card, struct mISDN_ctrl_req *cq)
        switch (cq->op) {
        case MISDN_CTRL_GETOP:
-                cq->op = 0;
+                cq->op = MISDN_CTRL_L1_TIMER3;
+                break;
+        case MISDN_CTRL_L1_TIMER3:
+                ret = l1_event(card->dch.l1, HW_TIMER3_VALUE | (cq->p1 & 0xff));
                break;
        default:
                pr_info("%s: unknown CTRL OP %x\n", card->name, cq->op);
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index a24530f05db0..c401634c00ec 100644
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -355,6 +355,22 @@ mISDN_unregister_Bprotocol(struct Bprotocol *bp)
 }
 EXPORT_SYMBOL(mISDN_unregister_Bprotocol);
+static const char *msg_no_channel = "<no channel>";
+static const char *msg_no_stack = "<no stack>";
+static const char *msg_no_stackdev = "<no stack device>";
+const char *mISDNDevName4ch(struct mISDNchannel *ch)
+{
+        if (!ch)
+                return msg_no_channel;
+        if (!ch->st)
+                return msg_no_stack;
+        if (!ch->st->dev)
+                return msg_no_stackdev;
+        return dev_name(&ch->st->dev->dev);
+};
+EXPORT_SYMBOL(mISDNDevName4ch);
 static int
 mISDNInit(void)
 {
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c
index 0fc49b375514..bebc57b72138 100644
--- a/drivers/isdn/mISDN/layer1.c
+++ b/drivers/isdn/mISDN/layer1.c
@@ -28,13 +28,15 @@ static u_int *debug;
 struct layer1 {
        u_long Flags;
        struct FsmInst l1m;
-        struct FsmTimer timer;
+        struct FsmTimer timer3;
+        struct FsmTimer timerX;
        int delay;
+        int t3_value;
        struct dchannel *dch;
        dchannel_l1callback *dcb;
 };
-#define TIMER3_VALUE 7000
+#define TIMER3_DEFAULT_VALUE    7000
 static
 struct Fsm l1fsm_s = {NULL, 0, 0, NULL, NULL};
@@ -134,7 +136,7 @@ l1_deact_req_s(struct FsmInst *fi, int event, void *arg)
        struct layer1 *l1 = fi->userdata;
        mISDN_FsmChangeState(fi, ST_L1_F3);
-        mISDN_FsmRestartTimer(&l1->timer, 550, EV_TIMER_DEACT, NULL, 2);
+        mISDN_FsmRestartTimer(&l1->timerX, 550, EV_TIMER_DEACT, NULL, 2);
        test_and_set_bit(FLG_L1_DEACTTIMER, &l1->Flags);
 }
@@ -179,11 +181,11 @@ l1_info4_ind(struct FsmInst *fi, int event, void *arg)
        mISDN_FsmChangeState(fi, ST_L1_F7);
        l1->dcb(l1->dch, INFO3_P8);
        if (test_and_clear_bit(FLG_L1_DEACTTIMER, &l1->Flags))
-                mISDN_FsmDelTimer(&l1->timer, 4);
+                mISDN_FsmDelTimer(&l1->timerX, 4);
        if (!test_bit(FLG_L1_ACTIVATED, &l1->Flags)) {
                if (test_and_clear_bit(FLG_L1_T3RUN, &l1->Flags))
-                        mISDN_FsmDelTimer(&l1->timer, 3);
+                        mISDN_FsmDelTimer(&l1->timer3, 3);
-                mISDN_FsmRestartTimer(&l1->timer, 110, EV_TIMER_ACT, NULL, 2);
+                mISDN_FsmRestartTimer(&l1->timerX, 110, EV_TIMER_ACT, NULL, 2);
                test_and_set_bit(FLG_L1_ACTTIMER, &l1->Flags);
        }
 }
@@ -201,7 +203,7 @@ l1_timer3(struct FsmInst *fi, int event, void *arg)
        }
        if (l1->l1m.state != ST_L1_F6) {
                mISDN_FsmChangeState(fi, ST_L1_F3);
-                l1->dcb(l1->dch, HW_POWERUP_REQ);
+                /* do not force anything here, we need send INFO 0 */
        }
 }
@@ -233,8 +235,9 @@ l1_activate_s(struct FsmInst *fi, int event, void *arg)
 {
        struct layer1 *l1 = fi->userdata;
-        mISDN_FsmRestartTimer(&l1->timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
+        mISDN_FsmRestartTimer(&l1->timer3, l1->t3_value, EV_TIMER3, NULL, 2);
        test_and_set_bit(FLG_L1_T3RUN, &l1->Flags);
+        /* Tell HW to send INFO 1 */
        l1->dcb(l1->dch, HW_RESET_REQ);
 }
@@ -302,7 +305,8 @@ static struct FsmNode L1SFnList[] =
 static void
 release_l1(struct layer1 *l1) {
-        mISDN_FsmDelTimer(&l1->timer, 0);
+        mISDN_FsmDelTimer(&l1->timerX, 0);
+        mISDN_FsmDelTimer(&l1->timer3, 0);
        if (l1->dch)
                l1->dch->l1 = NULL;
        module_put(THIS_MODULE);
@@ -356,6 +360,16 @@ l1_event(struct layer1 *l1, u_int event)
                release_l1(l1);
                break;
        default:
+                if ((event & ~HW_TIMER3_VMASK) == HW_TIMER3_VALUE) {
+                        int val = event & HW_TIMER3_VMASK;
+                        if (val < 5)
+                                val = 5;
+                        if (val > 30)
+                                val = 30;
+                        l1->t3_value = val;
+                        break;
+                }
                if (*debug & DEBUG_L1)
                        printk(KERN_DEBUG "%s %x unhandled\n",
                               __func__, event);
@@ -377,13 +391,15 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) {
        nl1->l1m.fsm = &l1fsm_s;
        nl1->l1m.state = ST_L1_F3;
        nl1->Flags = 0;
+        nl1->t3_value = TIMER3_DEFAULT_VALUE;
        nl1->l1m.debug = *debug & DEBUG_L1_FSM;
        nl1->l1m.userdata = nl1;
        nl1->l1m.userint = 0;
        nl1->l1m.printdebug = l1m_debug;
        nl1->dch = dch;
        nl1->dcb = dcb;
-        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer);
+        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timer3);
+        mISDN_FsmInitTimer(&nl1->l1m, &nl1->timerX);
        __module_get(THIS_MODULE);
        dch->l1 = nl1;
        return 0;
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index 39d7375fa551..0dc8abca1407 100644
--- a/drivers/isdn/mISDN/layer2.c
+++ b/drivers/isdn/mISDN/layer2.c
@@ -58,6 +58,8 @@ enum {
        EV_L1_DEACTIVATE,
        EV_L2_T200,
        EV_L2_T203,
+        EV_L2_T200I,
+        EV_L2_T203I,
        EV_L2_SET_OWN_BUSY,
        EV_L2_CLEAR_OWN_BUSY,
        EV_L2_FRAME_ERROR,
@@ -86,6 +88,8 @@ static char *strL2Event[] =
        "EV_L1_DEACTIVATE",
        "EV_L2_T200",
        "EV_L2_T203",
+        "EV_L2_T200I",
+        "EV_L2_T203I",
        "EV_L2_SET_OWN_BUSY",
        "EV_L2_CLEAR_OWN_BUSY",
        "EV_L2_FRAME_ERROR",
@@ -106,8 +110,8 @@ l2m_debug(struct FsmInst *fi, char *fmt, ...)
        vaf.fmt = fmt;
        vaf.va = &va;
-        printk(KERN_DEBUG "l2 (sapi %d tei %d): %pV\n",
+        printk(KERN_DEBUG "%s l2 (sapi %d tei %d): %pV\n",
-               l2->sapi, l2->tei, &vaf);
+               mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei, &vaf);
        va_end(va);
 }
@@ -150,7 +154,8 @@ l2up(struct layer2 *l2, u_int prim, struct sk_buff *skb)
        mISDN_HEAD_ID(skb) = (l2->ch.nr << 16) | l2->ch.addr;
        err = l2->up->send(l2->up, skb);
        if (err) {
-                printk(KERN_WARNING "%s: err=%d\n", __func__, err);
+                printk(KERN_WARNING "%s: dev %s err=%d\n", __func__,
+                       mISDNDevName4ch(&l2->ch), err);
                dev_kfree_skb(skb);
        }
 }
@@ -174,7 +179,8 @@ l2up_create(struct layer2 *l2, u_int prim, int len, void *arg)
                memcpy(skb_put(skb, len), arg, len);
        err = l2->up->send(l2->up, skb);
        if (err) {
-                printk(KERN_WARNING "%s: err=%d\n", __func__, err);
+                printk(KERN_WARNING "%s: dev %s err=%d\n", __func__,
+                       mISDNDevName4ch(&l2->ch), err);
                dev_kfree_skb(skb);
        }
 }
@@ -185,7 +191,8 @@ l2down_skb(struct layer2 *l2, struct sk_buff *skb) {
        ret = l2->ch.recv(l2->ch.peer, skb);
        if (ret && (*debug & DEBUG_L2_RECV))
-                printk(KERN_DEBUG "l2down_skb: ret(%d)\n", ret);
+                printk(KERN_DEBUG "l2down_skb: dev %s ret(%d)\n",
+                       mISDNDevName4ch(&l2->ch), ret);
        return ret;
 }
@@ -276,12 +283,37 @@ ph_data_confirm(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb) {
        return ret;
 }
+static void
+l2_timeout(struct FsmInst *fi, int event, void *arg)
+{
+        struct layer2 *l2 = fi->userdata;
+        struct sk_buff *skb;
+        struct mISDNhead *hh;
+        skb = mI_alloc_skb(0, GFP_ATOMIC);
+        if (!skb) {
+                printk(KERN_WARNING "%s: L2(%d,%d) nr:%x timer %s no skb\n",
+                       mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei,
+                       l2->ch.nr, event == EV_L2_T200 ? "T200" : "T203");
+                return;
+        }
+        hh = mISDN_HEAD_P(skb);
+        hh->prim = event == EV_L2_T200 ? DL_TIMER200_IND : DL_TIMER203_IND;
+        hh->id = l2->ch.nr;
+        if (*debug & DEBUG_TIMER)
+                printk(KERN_DEBUG "%s: L2(%d,%d) nr:%x timer %s expired\n",
+                       mISDNDevName4ch(&l2->ch), l2->sapi, l2->tei,
+                       l2->ch.nr, event == EV_L2_T200 ? "T200" : "T203");
+        if (l2->ch.st)
+                l2->ch.st->own.recv(&l2->ch.st->own, skb);
+}
 static int
 l2mgr(struct layer2 *l2, u_int prim, void *arg) {
        long c = (long)arg;
-        printk(KERN_WARNING
+        printk(KERN_WARNING "l2mgr: dev %s addr:%x prim %x %c\n",
-               "l2mgr: addr:%x prim %x %c\n", l2->id, prim, (char)c);
+               mISDNDevName4ch(&l2->ch), l2->id, prim, (char)c);
        if (test_bit(FLG_LAPD, &l2->flag) &&
            !test_bit(FLG_FIXED_TEI, &l2->flag)) {
                switch (c) {
@@ -603,8 +635,8 @@ send_uframe(struct layer2 *l2, struct sk_buff *skb, u_char cmd, u_char cr)
        else {
                skb = mI_alloc_skb(i, GFP_ATOMIC);
                if (!skb) {
-                        printk(KERN_WARNING "%s: can't alloc skbuff\n",
+                        printk(KERN_WARNING "%s: can't alloc skbuff in %s\n",
-                               __func__);
+                               mISDNDevName4ch(&l2->ch), __func__);
                        return;
                }
        }
@@ -1089,8 +1121,8 @@ enquiry_cr(struct layer2 *l2, u_char typ, u_char cr, u_char pf)
                tmp[i++] = (l2->vr << 5) | typ | (pf ? 0x10 : 0);
        skb = mI_alloc_skb(i, GFP_ATOMIC);
        if (!skb) {
-                printk(KERN_WARNING
+                printk(KERN_WARNING "%s: isdnl2 can't alloc sbbuff in %s\n",
-                       "isdnl2 can't alloc sbbuff for enquiry_cr\n");
+                       mISDNDevName4ch(&l2->ch), __func__);
                return;
        }
        memcpy(skb_put(skb, i), tmp, i);
@@ -1150,7 +1182,7 @@ invoke_retransmission(struct layer2 *l2, unsigned int nr)
                        else
                                printk(KERN_WARNING
                                       "%s: windowar[%d] is NULL\n",
-                                       __func__, p1);
+                                       mISDNDevName4ch(&l2->ch), p1);
                        l2->windowar[p1] = NULL;
                }
                mISDN_FsmEvent(&l2->l2m, EV_L2_ACK_PULL, NULL);
@@ -1461,8 +1493,8 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                p1 = (l2->vs - l2->va) % 8;
        p1 = (p1 + l2->sow) % l2->window;
        if (l2->windowar[p1]) {
-                printk(KERN_WARNING "isdnl2 try overwrite ack queue entry %d\n",
+                printk(KERN_WARNING "%s: l2 try overwrite ack queue entry %d\n",
-                       p1);
+                       mISDNDevName4ch(&l2->ch), p1);
                dev_kfree_skb(l2->windowar[p1]);
        }
        l2->windowar[p1] = skb;
@@ -1482,12 +1514,14 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                memcpy(skb_push(nskb, i), header, i);
        else {
                printk(KERN_WARNING
-                       "isdnl2 pull_iqueue skb header(%d/%d) too short\n", i, p1);
+                       "%s: L2 pull_iqueue skb header(%d/%d) too short\n",
+                       mISDNDevName4ch(&l2->ch), i, p1);
                oskb = nskb;
                nskb = mI_alloc_skb(oskb->len + i, GFP_ATOMIC);
                if (!nskb) {
                        dev_kfree_skb(oskb);
-                        printk(KERN_WARNING "%s: no skb mem\n", __func__);
+                        printk(KERN_WARNING "%s: no skb mem in %s\n",
+                               mISDNDevName4ch(&l2->ch), __func__);
                        return;
                }
                memcpy(skb_put(nskb, i), header, i);
@@ -1814,11 +1848,16 @@ static struct FsmNode L2FnList[] =
        {ST_L2_8, EV_L2_SUPER, l2_st8_got_super},
        {ST_L2_7, EV_L2_I, l2_got_iframe},
        {ST_L2_8, EV_L2_I, l2_got_iframe},
-        {ST_L2_5, EV_L2_T200, l2_st5_tout_200},
+        {ST_L2_5, EV_L2_T200, l2_timeout},
-        {ST_L2_6, EV_L2_T200, l2_st6_tout_200},
+        {ST_L2_6, EV_L2_T200, l2_timeout},
-        {ST_L2_7, EV_L2_T200, l2_st7_tout_200},
+        {ST_L2_7, EV_L2_T200, l2_timeout},
-        {ST_L2_8, EV_L2_T200, l2_st8_tout_200},
+        {ST_L2_8, EV_L2_T200, l2_timeout},
-        {ST_L2_7, EV_L2_T203, l2_st7_tout_203},
+        {ST_L2_7, EV_L2_T203, l2_timeout},
+        {ST_L2_5, EV_L2_T200I, l2_st5_tout_200},
+        {ST_L2_6, EV_L2_T200I, l2_st6_tout_200},
+        {ST_L2_7, EV_L2_T200I, l2_st7_tout_200},
+        {ST_L2_8, EV_L2_T200I, l2_st8_tout_200},
+        {ST_L2_7, EV_L2_T203I, l2_st7_tout_203},
        {ST_L2_7, EV_L2_ACK_PULL, l2_pull_iqueue},
        {ST_L2_7, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
        {ST_L2_8, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
@@ -1858,7 +1897,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                ptei = *datap++;
                if ((psapi & 1) || !(ptei & 1)) {
                        printk(KERN_WARNING
-                               "l2 D-channel frame wrong EA0/EA1\n");
+                               "%s l2 D-channel frame wrong EA0/EA1\n",
+                               mISDNDevName4ch(&l2->ch));
                        return ret;
                }
                psapi >>= 2;
@@ -1867,7 +1907,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                        /* not our business */
                        if (*debug & DEBUG_L2)
                                printk(KERN_DEBUG "%s: sapi %d/%d mismatch\n",
-                                       __func__, psapi, l2->sapi);
+                                       mISDNDevName4ch(&l2->ch), psapi,
+                                       l2->sapi);
                        dev_kfree_skb(skb);
                        return 0;
                }
@@ -1875,7 +1916,7 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
                        /* not our business */
                        if (*debug & DEBUG_L2)
                                printk(KERN_DEBUG "%s: tei %d/%d mismatch\n",
-                                       __func__, ptei, l2->tei);
+                                       mISDNDevName4ch(&l2->ch), ptei, l2->tei);
                        dev_kfree_skb(skb);
                        return 0;
                }
@@ -1916,7 +1957,8 @@ ph_data_indication(struct layer2 *l2, struct mISDNhead *hh, struct sk_buff *skb)
        } else
                c = 'L';
        if (c) {
-                printk(KERN_WARNING "l2 D-channel frame error %c\n", c);
+                printk(KERN_WARNING "%s:l2 D-channel frame error %c\n",
+                       mISDNDevName4ch(&l2->ch), c);
                mISDN_FsmEvent(&l2->l2m, EV_L2_FRAME_ERROR, (void *)(long)c);
        }
        return ret;
@@ -1930,8 +1972,17 @@ l2_send(struct mISDNchannel *ch, struct sk_buff *skb)
        int                     ret = -EINVAL;
        if (*debug & DEBUG_L2_RECV)
-                printk(KERN_DEBUG "%s: prim(%x) id(%x) sapi(%d) tei(%d)\n",
+                printk(KERN_DEBUG "%s: %s prim(%x) id(%x) sapi(%d) tei(%d)\n",
-                       __func__, hh->prim, hh->id, l2->sapi, l2->tei);
+                       __func__, mISDNDevName4ch(&l2->ch), hh->prim, hh->id,
+                       l2->sapi, l2->tei);
+        if (hh->prim == DL_INTERN_MSG) {
+                struct mISDNhead *chh = hh + 1; /* saved copy */
+                *hh = *chh;
+                if (*debug & DEBUG_L2_RECV)
+                        printk(KERN_DEBUG "%s: prim(%x) id(%x) internal msg\n",
+                                mISDNDevName4ch(&l2->ch), hh->prim, hh->id);
+        }
        switch (hh->prim) {
        case PH_DATA_IND:
                ret = ph_data_indication(l2, hh, skb);
@@ -1987,6 +2038,12 @@ l2_send(struct mISDNchannel *ch, struct sk_buff *skb)
                ret = mISDN_FsmEvent(&l2->l2m, EV_L2_DL_RELEASE_REQ,
                                     skb);
                break;
+        case DL_TIMER200_IND:
+                mISDN_FsmEvent(&l2->l2m, EV_L2_T200I, NULL);
+                break;
+        case DL_TIMER203_IND:
+                mISDN_FsmEvent(&l2->l2m, EV_L2_T203I, NULL);
+                break;
        default:
                if (*debug & DEBUG_L2)
                        l2m_debug(&l2->l2m, "l2 unknown pr %04x",
@@ -2005,7 +2062,8 @@ tei_l2(struct layer2 *l2, u_int cmd, u_long arg)
        int             ret = -EINVAL;
        if (*debug & DEBUG_L2_TEI)
-                printk(KERN_DEBUG "%s: cmd(%x)\n", __func__, cmd);
+                printk(KERN_DEBUG "%s: cmd(%x) in %s\n",
+                       mISDNDevName4ch(&l2->ch), cmd, __func__);
        switch (cmd) {
        case (MDL_ASSIGN_REQ):
                ret = mISDN_FsmEvent(&l2->l2m, EV_L2_MDL_ASSIGN, (void *)arg);
@@ -2018,7 +2076,8 @@ tei_l2(struct layer2 *l2, u_int cmd, u_long arg)
                break;
        case (MDL_ERROR_RSP):
                /* ETS 300-125 5.3.2.1 Test: TC13010 */
-                printk(KERN_NOTICE "MDL_ERROR|REQ (tei_l2)\n");
+                printk(KERN_NOTICE "%s: MDL_ERROR|REQ (tei_l2)\n",
+                       mISDNDevName4ch(&l2->ch));
                ret = mISDN_FsmEvent(&l2->l2m, EV_L2_MDL_ERROR, NULL);
                break;
        }
@@ -2050,7 +2109,8 @@ l2_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
        u_int                   info;
        if (*debug & DEBUG_L2_CTRL)
-                printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd);
+                printk(KERN_DEBUG "%s: %s cmd(%x)\n",
+                       mISDNDevName4ch(ch), __func__, cmd);
        switch (cmd) {
        case OPEN_CHANNEL:
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index ba2bc0c776e2..be88728f1106 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -790,18 +790,23 @@ tei_ph_data_ind(struct teimgr *tm, u_int mt, u_char *dp, int len)
 static struct layer2 *
 create_new_tei(struct manager *mgr, int tei, int sapi)
 {
-        u_long          opt = 0;
+        unsigned long           opt = 0;
-        u_long          flags;
+        unsigned long           flags;
-        int             id;
+        int                     id;
-        struct layer2   *l2;
+        struct layer2           *l2;
+        struct channel_req      rq;
        if (!mgr->up)
                return NULL;
        if ((tei >= 0) && (tei < 64))
                test_and_set_bit(OPTION_L2_FIXEDTEI, &opt);
-        if (mgr->ch.st->dev->Dprotocols
+        if (mgr->ch.st->dev->Dprotocols & ((1 << ISDN_P_TE_E1) |
-            & ((1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1)))
+            (1 << ISDN_P_NT_E1))) {
                test_and_set_bit(OPTION_L2_PMX, &opt);
+                rq.protocol = ISDN_P_NT_E1;
+        } else {
+                rq.protocol = ISDN_P_NT_S0;
+        }
        l2 = create_l2(mgr->up, ISDN_P_LAPD_NT, opt, tei, sapi);
        if (!l2) {
                printk(KERN_WARNING "%s:no memory for layer2\n", __func__);
@@ -836,6 +841,14 @@ create_new_tei(struct manager *mgr, int tei, int sapi)
                l2->ch.recv = mgr->ch.recv;
                l2->ch.peer = mgr->ch.peer;
                l2->ch.ctrl(&l2->ch, OPEN_CHANNEL, NULL);
+                /* We need open here L1 for the manager as well (refcounting) */
+                rq.adr.dev = mgr->ch.st->dev->id;
+                id = mgr->ch.st->own.ctrl(&mgr->ch.st->own, OPEN_CHANNEL, &rq);
+                if (id < 0) {
+                        printk(KERN_WARNING "%s: cannot open L1\n", __func__);
+                        l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
+                        l2 = NULL;
+                }
        }
        return l2;
 }
@@ -978,10 +991,11 @@ TEIrelease(struct layer2 *l2)
 static int
 create_teimgr(struct manager *mgr, struct channel_req *crq)
 {
-        struct layer2   *l2;
+        struct layer2           *l2;
-        u_long          opt = 0;
+        unsigned long           opt = 0;
-        u_long          flags;
+        unsigned long           flags;
-        int             id;
+        int                     id;
+        struct channel_req      l1rq;
        if (*debug & DEBUG_L2_TEI)
                printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
@@ -1016,6 +1030,7 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                if (crq->protocol == ISDN_P_LAPD_TE)
                        test_and_set_bit(MGR_OPT_USER, &mgr->options);
        }
+        l1rq.adr = crq->adr;
        if (mgr->ch.st->dev->Dprotocols
            & ((1 << ISDN_P_TE_E1) | (1 << ISDN_P_NT_E1)))
                test_and_set_bit(OPTION_L2_PMX, &opt);
@@ -1023,6 +1038,8 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                mgr->up = crq->ch;
                id = DL_INFO_L2_CONNECT;
                teiup_create(mgr, DL_INFORMATION_IND, sizeof(id), &id);
+                if (test_bit(MGR_PH_ACTIVE, &mgr->options))
+                        teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
                crq->ch = NULL;
                if (!list_empty(&mgr->layer2)) {
                        read_lock_irqsave(&mgr->lock, flags);
@@ -1053,24 +1070,34 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
                l2->tm->tei_m.fsm = &teifsmu;
                l2->tm->tei_m.state = ST_TEI_NOP;
                l2->tm->tval = 1000; /* T201  1 sec */
+                if (test_bit(OPTION_L2_PMX, &opt))
+                        l1rq.protocol = ISDN_P_TE_E1;
+                else
+                        l1rq.protocol = ISDN_P_TE_S0;
        } else {
                l2->tm->tei_m.fsm = &teifsmn;
                l2->tm->tei_m.state = ST_TEI_NOP;
                l2->tm->tval = 2000; /* T202  2 sec */
+                if (test_bit(OPTION_L2_PMX, &opt))
+                        l1rq.protocol = ISDN_P_NT_E1;
+                else
+                        l1rq.protocol = ISDN_P_NT_S0;
        }
        mISDN_FsmInitTimer(&l2->tm->tei_m, &l2->tm->timer);
        write_lock_irqsave(&mgr->lock, flags);
        id = get_free_id(mgr);
        list_add_tail(&l2->list, &mgr->layer2);
        write_unlock_irqrestore(&mgr->lock, flags);
-        if (id < 0) {
+        if (id >= 0) {
-                l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
-        } else {
                l2->ch.nr = id;
                l2->up->nr = id;
                crq->ch = &l2->ch;
-                id = 0;
+                /* We need open here L1 for the manager as well (refcounting) */
+                id = mgr->ch.st->own.ctrl(&mgr->ch.st->own, OPEN_CHANNEL,
+                                          &l1rq);
        }
+        if (id < 0)
+                l2->ch.ctrl(&l2->ch, CLOSE_CHANNEL, NULL);
        return id;
 }
@@ -1096,12 +1123,16 @@ mgr_send(struct mISDNchannel *ch, struct sk_buff *skb)
                break;
        case PH_ACTIVATE_IND:
                test_and_set_bit(MGR_PH_ACTIVE, &mgr->options);
+                if (mgr->up)
+                        teiup_create(mgr, PH_ACTIVATE_IND, 0, NULL);
                mISDN_FsmEvent(&mgr->deact, EV_ACTIVATE_IND, NULL);
                do_send(mgr);
                ret = 0;
                break;
        case PH_DEACTIVATE_IND:
                test_and_clear_bit(MGR_PH_ACTIVE, &mgr->options);
+                if (mgr->up)
+                        teiup_create(mgr, PH_DEACTIVATE_IND, 0, NULL);
                mISDN_FsmEvent(&mgr->deact, EV_DEACTIVATE_IND, NULL);
                ret = 0;
                break;
@@ -1263,7 +1294,7 @@ static int
 mgr_bcast(struct mISDNchannel *ch, struct sk_buff *skb)
 {
        struct manager          *mgr = container_of(ch, struct manager, bcast);
-        struct mISDNhead        *hh = mISDN_HEAD_P(skb);
+        struct mISDNhead        *hhc, *hh = mISDN_HEAD_P(skb);
        struct sk_buff          *cskb = NULL;
        struct layer2           *l2;
        u_long                  flags;
@@ -1278,10 +1309,17 @@ mgr_bcast(struct mISDNchannel *ch, struct sk_buff *skb)
                                skb = NULL;
                        } else {
                                if (!cskb)
-                                        cskb = skb_copy(skb, GFP_KERNEL);
+                                        cskb = skb_copy(skb, GFP_ATOMIC);
                        }
                        if (cskb) {
-                                ret = l2->ch.send(&l2->ch, cskb);
+                                hhc = mISDN_HEAD_P(cskb);
+                                /* save original header behind normal header */
+                                hhc++;
+                                *hhc = *hh;
+                                hhc--;
+                                hhc->prim = DL_INTERN_MSG;
+                                hhc->id = l2->ch.nr;
+                                ret = ch->st->own.recv(&ch->st->own, cskb);
                                if (ret) {
                                        if (*debug & DEBUG_SEND_ERR)
                                                printk(KERN_DEBUG
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 35b82e00d052..fcf73518f63c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1281,14 +1281,17 @@ static void bnx2x_hc_int_enable(struct bnx2x *bp)
        int port = BP_PORT(bp);
        u32 addr = port ? HC_REG_CONFIG_1 : HC_REG_CONFIG_0;
        u32 val = REG_RD(bp, addr);
-        int msix = (bp->flags & USING_MSIX_FLAG) ? 1 : 0;
+        bool msix = (bp->flags & USING_MSIX_FLAG) ? true : false;
-        int msi = (bp->flags & USING_MSI_FLAG) ? 1 : 0;
+        bool single_msix = (bp->flags & USING_SINGLE_MSIX_FLAG) ? true : false;
+        bool msi = (bp->flags & USING_MSI_FLAG) ? true : false;
        if (msix) {
                val &= ~(HC_CONFIG_0_REG_SINGLE_ISR_EN_0 |
                         HC_CONFIG_0_REG_INT_LINE_EN_0);
                val |= (HC_CONFIG_0_REG_MSI_MSIX_INT_EN_0 |
                        HC_CONFIG_0_REG_ATTN_BIT_EN_0);
+                if (single_msix)
+                        val |= HC_CONFIG_0_REG_SINGLE_ISR_EN_0;
        } else if (msi) {
                val &= ~HC_CONFIG_0_REG_INT_LINE_EN_0;
                val |= (HC_CONFIG_0_REG_SINGLE_ISR_EN_0 |
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 7b06f3592bd7..747f68fa976d 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -558,7 +558,7 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                                be_link_status_update(adapter, link_status);
                        if (link_speed)
                                et_speed = link_speed * 10;
-                        else
+                        else if (link_status)
                                et_speed = convert_to_et_speed(port_speed);
                } else {
                        et_speed = adapter->phy.forced_port_speed;
@@ -618,7 +618,7 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                ecmd->supported = adapter->phy.supported;
        }
-        ecmd->duplex = DUPLEX_FULL;
+        ecmd->duplex = netif_carrier_ok(netdev) ? DUPLEX_FULL : DUPLEX_UNKNOWN;
        ecmd->phy_address = adapter->port_num;
        return 0;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index c8f7b3aace65..6d5d30be0481 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1259,6 +1259,7 @@ static void be_rx_compl_process(struct be_rx_obj *rxo,
                skb_checksum_none_assert(skb);
        skb->protocol = eth_type_trans(skb, netdev);
+        skb_record_rx_queue(skb, rxo - &adapter->rx_obj[0]);
        if (netdev->features & NETIF_F_RXHASH)
                skb->rxhash = rxcp->rss_hash;
@@ -1315,6 +1316,7 @@ void be_rx_compl_process_gro(struct be_rx_obj *rxo, struct napi_struct *napi,
        skb->len = rxcp->pkt_size;
        skb->data_len = rxcp->pkt_size;
        skb->ip_summed = CHECKSUM_UNNECESSARY;
+        skb_record_rx_queue(skb, rxo - &adapter->rx_obj[0]);
        if (adapter->netdev->features & NETIF_F_RXHASH)
                skb->rxhash = rxcp->rss_hash;
@@ -3819,6 +3821,11 @@ static pci_ers_result_t be_eeh_err_detected(struct pci_dev *pdev,
        pci_disable_device(pdev);
+        /* The error could cause the FW to trigger a flash debug dump.
+         * Resetting the card while flash dump is in progress
+         * can cause it not to recover; wait for it to finish
+         */
+        ssleep(30);
        return PCI_ERS_RESULT_NEED_RESET;
 }
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 74215c05d799..546efe30c9b8 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -193,6 +193,14 @@ config IXGBE
          To compile this driver as a module, choose M here. The module
          will be called ixgbe.
+config IXGBE_HWMON
+        bool "Intel(R) 10GbE PCI Express adapters HWMON support"
+        default y
+        depends on IXGBE && HWMON && !(IXGBE=y && HWMON=m)
+        ---help---
+          Say Y if you want to expose the thermal sensor data on some of
+          our cards, via a hwmon sysfs interface.
 config IXGBE_DCA
        bool "Direct Cache Access (DCA) Support"
        default y
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index a212846a6574..4dd18a1f45d2 100644
--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -944,6 +944,14 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
        else
                reg |= (1 << 28);
        ew32(TARC(1), reg);
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        reg = er32(RFCTL);
+        reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+        ew32(RFCTL, reg);
 }
 /**
@@ -1439,6 +1447,7 @@ static const struct e1000_mac_operations es2_mac_ops = {
        /* setup_physical_interface dependent on media type */
        .setup_led              = e1000e_setup_led_generic,
        .config_collision_dist  = e1000e_config_collision_dist_generic,
+        .rar_set                = e1000e_rar_set_generic,
 };
 static const struct e1000_phy_operations es2_phy_ops = {
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index d0ea316731fc..36db4df09aed 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -999,7 +999,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
 **/
 static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 {
-        u32 ctrl, ctrl_ext;
+        u32 ctrl, ctrl_ext, eecd;
        s32 ret_val;
        /*
@@ -1072,6 +1072,16 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
         */
        switch (hw->mac.type) {
+        case e1000_82571:
+        case e1000_82572:
+                /*
+                 * REQ and GNT bits need to be cleared when using AUTO_RD
+                 * to access the EEPROM.
+                 */
+                eecd = er32(EECD);
+                eecd &= ~(E1000_EECD_REQ | E1000_EECD_GNT);
+                ew32(EECD, eecd);
+                break;
        case e1000_82573:
        case e1000_82574:
        case e1000_82583:
@@ -1279,6 +1289,16 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
                ew32(CTRL_EXT, reg);
        }
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        if (hw->mac.type <= e1000_82573) {
+                reg = er32(RFCTL);
+                reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+                ew32(RFCTL, reg);
+        }
        /* PCI-Ex Control Registers */
        switch (hw->mac.type) {
        case e1000_82574:
@@ -1762,7 +1782,8 @@ void e1000e_set_laa_state_82571(struct e1000_hw *hw, bool state)
                 * incoming packets directed to this port are dropped.
                 * Eventually the LAA will be in RAR[0] and RAR[14].
                 */
-                e1000e_rar_set(hw, hw->mac.addr, hw->mac.rar_entry_count - 1);
+                hw->mac.ops.rar_set(hw, hw->mac.addr,
+                                    hw->mac.rar_entry_count - 1);
 }
 /**
@@ -1926,6 +1947,7 @@ static const struct e1000_mac_operations e82571_mac_ops = {
        .setup_led              = e1000e_setup_led_generic,
        .config_collision_dist  = e1000e_config_collision_dist_generic,
        .read_mac_addr          = e1000_read_mac_addr_82571,
+        .rar_set                = e1000e_rar_set_generic,
 };
 static const struct e1000_phy_operations e82_phy_ops_igp = {
@@ -2060,8 +2082,9 @@ const struct e1000_info e1000_82574_info = {
                                  | FLAG_HAS_SMART_POWER_DOWN
                                  | FLAG_HAS_AMT
                                  | FLAG_HAS_CTRLEXT_ON_LOAD,
-        .flags2                   = FLAG2_CHECK_PHY_HANG
+        .flags2                  = FLAG2_CHECK_PHY_HANG
                                  | FLAG2_DISABLE_ASPM_L0S
+                                  | FLAG2_DISABLE_ASPM_L1
                                  | FLAG2_NO_DISABLE_RX
                                  | FLAG2_DMA_BURST,
        .pba                    = 32,
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
index 3a5025917163..11c46661af09 100644
--- a/drivers/net/ethernet/intel/e1000e/defines.h
+++ b/drivers/net/ethernet/intel/e1000e/defines.h
@@ -74,7 +74,9 @@
 #define E1000_WUS_BC           E1000_WUFC_BC
 /* Extended Device Control */
+#define E1000_CTRL_EXT_LPCD  0x00000004     /* LCD Power Cycle Done */
 #define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
+#define E1000_CTRL_EXT_FORCE_SMBUS 0x00000004 /* Force SMBus mode*/
 #define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
 #define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
 #define E1000_CTRL_EXT_RO_DIS    0x00020000 /* Relaxed Ordering disable */
@@ -573,6 +575,7 @@
 #define NWAY_AR_ASM_DIR          0x0800   /* Asymmetric Pause Direction bit */
 /* Link Partner Ability Register (Base Page) */
+#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP 100TX Full Dplx Capable */
 #define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
 #define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
@@ -739,6 +742,7 @@
 #define I82577_E_PHY_ID      0x01540050
 #define I82578_E_PHY_ID      0x004DD040
 #define I82579_E_PHY_ID      0x01540090
+#define I217_E_PHY_ID        0x015400A0
 /* M88E1000 Specific Registers */
 #define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
@@ -850,4 +854,8 @@
 /* SerDes Control */
 #define E1000_GEN_POLL_TIMEOUT          640
+/* FW Semaphore */
+#define E1000_FWSM_WLOCK_MAC_MASK       0x0380
+#define E1000_FWSM_WLOCK_MAC_SHIFT      7
 #endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 1dc2067d3f28..6e6fffb34581 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -206,6 +206,7 @@ enum e1000_boards {
        board_ich10lan,
        board_pchlan,
        board_pch2lan,
+        board_pch_lpt,
 };
 struct e1000_ps_page {
@@ -528,6 +529,7 @@ extern const struct e1000_info e1000_ich9_info;
 extern const struct e1000_info e1000_ich10_info;
 extern const struct e1000_info e1000_pch_info;
 extern const struct e1000_info e1000_pch2_info;
+extern const struct e1000_info e1000_pch_lpt_info;
 extern const struct e1000_info e1000_es2_info;
 extern s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
@@ -576,7 +578,7 @@ extern void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count);
 extern void e1000e_update_mc_addr_list_generic(struct e1000_hw *hw,
                                               u8 *mc_addr_list,
                                               u32 mc_addr_count);
-extern void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
+extern void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
 extern s32 e1000e_set_fc_watermarks(struct e1000_hw *hw);
 extern void e1000e_set_pcie_no_snoop(struct e1000_hw *hw, u32 no_snoop);
 extern s32 e1000e_get_hw_semaphore(struct e1000_hw *hw);
@@ -673,11 +675,21 @@ static inline s32 e1e_rphy(struct e1000_hw *hw, u32 offset, u16 *data)
        return hw->phy.ops.read_reg(hw, offset, data);
 }
+static inline s32 e1e_rphy_locked(struct e1000_hw *hw, u32 offset, u16 *data)
+{
+        return hw->phy.ops.read_reg_locked(hw, offset, data);
+}
 static inline s32 e1e_wphy(struct e1000_hw *hw, u32 offset, u16 data)
 {
        return hw->phy.ops.write_reg(hw, offset, data);
 }
+static inline s32 e1e_wphy_locked(struct e1000_hw *hw, u32 offset, u16 data)
+{
+        return hw->phy.ops.write_reg_locked(hw, offset, data);
+}
 static inline s32 e1000_get_cable_length(struct e1000_hw *hw)
 {
        return hw->phy.ops.get_cable_length(hw);
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 4f1edd9c22f1..d863075df7a4 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -773,6 +773,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        u32 i;
        u32 toggle;
        u32 mask;
+        u32 wlock_mac = 0;
        /*
         * The status register is Read Only, so a write should fail.
@@ -838,19 +839,31 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
        case e1000_ich10lan:
        case e1000_pchlan:
        case e1000_pch2lan:
+        case e1000_pch_lpt:
                mask |= (1 << 18);
                break;
        default:
                break;
        }
-        for (i = 0; i < mac->rar_entry_count; i++)
+        if (mac->type == e1000_pch_lpt)
+                wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>
+                    E1000_FWSM_WLOCK_MAC_SHIFT;
+        for (i = 0; i < mac->rar_entry_count; i++) {
+                /* Cannot test write-protected SHRAL[n] registers */
+                if ((wlock_mac == 1) || (wlock_mac && (i > wlock_mac)))
+                        continue;
                REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-                                       mask, 0xFFFFFFFF);
+                                       mask, 0xFFFFFFFF);
+        }
        for (i = 0; i < mac->mta_reg_count; i++)
                REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
        *data = 0;
        return 0;
 }
diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
index 7ca1b68e2e3d..ed5b40985edb 100644
--- a/drivers/net/ethernet/intel/e1000e/hw.h
+++ b/drivers/net/ethernet/intel/e1000e/hw.h
@@ -51,6 +51,7 @@ enum e1e_registers {
        E1000_FEXTNVM  = 0x00028, /* Future Extended NVM - RW */
        E1000_FCT      = 0x00030, /* Flow Control Type - RW */
        E1000_VET      = 0x00038, /* VLAN Ether Type - RW */
+        E1000_FEXTNVM3 = 0x0003C, /* Future Extended NVM 3 - RW */
        E1000_ICR      = 0x000C0, /* Interrupt Cause Read - R/clr */
        E1000_ITR      = 0x000C4, /* Interrupt Throttling Rate - RW */
        E1000_ICS      = 0x000C8, /* Interrupt Cause Set - WO */
@@ -199,6 +200,14 @@ enum e1e_registers {
 #define E1000_RA        (E1000_RAL(0))
        E1000_RAH_BASE = 0x05404, /* Receive Address High - RW */
 #define E1000_RAH(_n)   (E1000_RAH_BASE + ((_n) * 8))
+        E1000_SHRAL_PCH_LPT_BASE = 0x05408,
+#define E1000_SHRAL_PCH_LPT(_n)   (E1000_SHRAL_PCH_LPT_BASE + ((_n) * 8))
+        E1000_SHRAH_PCH_LTP_BASE = 0x0540C,
+#define E1000_SHRAH_PCH_LPT(_n)   (E1000_SHRAH_PCH_LTP_BASE + ((_n) * 8))
+        E1000_SHRAL_BASE = 0x05438, /* Shared Receive Address Low - RW */
+#define E1000_SHRAL(_n)   (E1000_SHRAL_BASE + ((_n) * 8))
+        E1000_SHRAH_BASE = 0x0543C, /* Shared Receive Address High - RW */
+#define E1000_SHRAH(_n)   (E1000_SHRAH_BASE + ((_n) * 8))
        E1000_VFTA     = 0x05600, /* VLAN Filter Table Array - RW Array */
        E1000_WUC      = 0x05800, /* Wakeup Control - RW */
        E1000_WUFC     = 0x05808, /* Wakeup Filter Control - RW */
@@ -401,6 +410,8 @@ enum e1e_registers {
 #define E1000_DEV_ID_PCH_D_HV_DC                0x10F0
 #define E1000_DEV_ID_PCH2_LV_LM                 0x1502
 #define E1000_DEV_ID_PCH2_LV_V                  0x1503
+#define E1000_DEV_ID_PCH_LPT_I217_LM            0x153A
+#define E1000_DEV_ID_PCH_LPT_I217_V             0x153B
 #define E1000_REVISION_4 4
@@ -421,6 +432,7 @@ enum e1000_mac_type {
        e1000_ich10lan,
        e1000_pchlan,
        e1000_pch2lan,
+        e1000_pch_lpt,
 };
 enum e1000_media_type {
@@ -458,6 +470,7 @@ enum e1000_phy_type {
        e1000_phy_82578,
        e1000_phy_82577,
        e1000_phy_82579,
+        e1000_phy_i217,
 };
 enum e1000_bus_width {
@@ -781,6 +794,7 @@ struct e1000_mac_operations {
        s32  (*setup_led)(struct e1000_hw *);
        void (*write_vfta)(struct e1000_hw *, u32, u32);
        void (*config_collision_dist)(struct e1000_hw *);
+        void (*rar_set)(struct e1000_hw *, u8 *, u32);
        s32  (*read_mac_addr)(struct e1000_hw *);
 };
@@ -965,6 +979,7 @@ struct e1000_dev_spec_ich8lan {
        struct e1000_shadow_ram shadow_ram[E1000_ICH8_SHADOW_RAM_WORDS];
        bool nvm_k1_enabled;
        bool eee_disable;
+        u16 eee_lp_ability;
 };
 struct e1000_hw {
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index d7fd1e848ddc..bbf70ba367da 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -105,6 +105,9 @@
 #define E1000_FEXTNVM_SW_CONFIG         1
 #define E1000_FEXTNVM_SW_CONFIG_ICH8M (1 << 27) /* Bit redefined for ICH8M :/ */
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK    0x0C000000
+#define E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC  0x08000000
 #define E1000_FEXTNVM4_BEACON_DURATION_MASK    0x7
 #define E1000_FEXTNVM4_BEACON_DURATION_8USEC   0x7
 #define E1000_FEXTNVM4_BEACON_DURATION_16USEC  0x3
@@ -112,6 +115,8 @@
 #define PCIE_ICH8_SNOOP_ALL             PCIE_NO_SNOOP_ALL
 #define E1000_ICH_RAR_ENTRIES           7
+#define E1000_PCH2_RAR_ENTRIES          5 /* RAR[0], SHRA[0-3] */
+#define E1000_PCH_LPT_RAR_ENTRIES       12 /* RAR[0], SHRA[0-10] */
 #define PHY_PAGE_SHIFT 5
 #define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \
@@ -127,11 +132,18 @@
 #define SW_FLAG_TIMEOUT    1000 /* SW Semaphore flag timeout in milliseconds */
+/* SMBus Control Phy Register */
+#define CV_SMB_CTRL             PHY_REG(769, 23)
+#define CV_SMB_CTRL_FORCE_SMBUS 0x0001
 /* SMBus Address Phy Register */
 #define HV_SMB_ADDR            PHY_REG(768, 26)
 #define HV_SMB_ADDR_MASK       0x007F
 #define HV_SMB_ADDR_PEC_EN     0x0200
 #define HV_SMB_ADDR_VALID      0x0080
+#define HV_SMB_ADDR_FREQ_MASK           0x1100
+#define HV_SMB_ADDR_FREQ_LOW_SHIFT      8
+#define HV_SMB_ADDR_FREQ_HIGH_SHIFT     12
 /* PHY Power Management Control */
 #define HV_PM_CTRL              PHY_REG(770, 17)
@@ -148,11 +160,26 @@
 #define I82579_LPI_UPDATE_TIMER 0x4805  /* in 40ns units + 40 ns base value */
 #define I82579_MSE_THRESHOLD    0x084F  /* Mean Square Error Threshold */
 #define I82579_MSE_LINK_DOWN    0x2411  /* MSE count before dropping link */
+#define I217_EEE_ADVERTISEMENT  0x8001  /* IEEE MMD Register 7.60 */
+#define I217_EEE_LP_ABILITY     0x8002  /* IEEE MMD Register 7.61 */
+#define I217_EEE_100_SUPPORTED  (1 << 1)        /* 100BaseTx EEE supported */
+/* Intel Rapid Start Technology Support */
+#define I217_PROXY_CTRL                 PHY_REG(BM_WUC_PAGE, 70)
+#define I217_PROXY_CTRL_AUTO_DISABLE    0x0080
+#define I217_SxCTRL                     PHY_REG(BM_PORT_CTRL_PAGE, 28)
+#define I217_SxCTRL_MASK                0x1000
+#define I217_CGFREG                     PHY_REG(772, 29)
+#define I217_CGFREG_MASK                0x0002
+#define I217_MEMPWR                     PHY_REG(772, 26)
+#define I217_MEMPWR_MASK                0x0010
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
 #define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
 #define E1000_STRAP_SMBUS_ADDRESS_SHIFT 17
+#define E1000_STRAP_SMT_FREQ_MASK       0x00003000
+#define E1000_STRAP_SMT_FREQ_SHIFT      12
 /* OEM Bits Phy Register */
 #define HV_OEM_BITS            PHY_REG(768, 25)
@@ -256,6 +283,8 @@ static s32  e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
 static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
 static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
 static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
+static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
 static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
 static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
@@ -284,18 +313,161 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
 #define ew16flash(reg, val)     __ew16flash(hw, (reg), (val))
 #define ew32flash(reg, val)     __ew32flash(hw, (reg), (val))
-static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
+/**
+ *  e1000_phy_is_accessible_pchlan - Check if able to access PHY registers
+ *  @hw: pointer to the HW structure
+ *
+ *  Test access to the PHY registers by reading the PHY ID registers.  If
+ *  the PHY ID is already known (e.g. resume path) compare it with known ID,
+ *  otherwise assume the read PHY ID is correct if it is valid.
+ *
+ *  Assumes the sw/fw/hw semaphore is already acquired.
+ **/
+static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
 {
-        u32 ctrl;
+        u16 phy_reg;
+        u32 phy_id;
-        ctrl = er32(CTRL);
+        e1e_rphy_locked(hw, PHY_ID1, &phy_reg);
-        ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
+        phy_id = (u32)(phy_reg << 16);
-        ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
+        e1e_rphy_locked(hw, PHY_ID2, &phy_reg);
-        ew32(CTRL, ctrl);
+        phy_id |= (u32)(phy_reg & PHY_REVISION_MASK);
-        e1e_flush();
-        udelay(10);
+        if (hw->phy.id) {
-        ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+                if (hw->phy.id == phy_id)
-        ew32(CTRL, ctrl);
+                        return true;
+        } else {
+                if ((phy_id != 0) && (phy_id != PHY_REVISION_MASK))
+                        hw->phy.id = phy_id;
+                return true;
+        }
+        return false;
+}
+/**
+ *  e1000_init_phy_workarounds_pchlan - PHY initialization workarounds
+ *  @hw: pointer to the HW structure
+ *
+ *  Workarounds/flow necessary for PHY initialization during driver load
+ *  and resume paths.
+ **/
+static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
+{
+        u32 mac_reg, fwsm = er32(FWSM);
+        s32 ret_val;
+        u16 phy_reg;
+        ret_val = hw->phy.ops.acquire(hw);
+        if (ret_val) {
+                e_dbg("Failed to initialize PHY flow\n");
+                return ret_val;
+        }
+        /*
+         * The MAC-PHY interconnect may be in SMBus mode.  If the PHY is
+         * inaccessible and resetting the PHY is not blocked, toggle the
+         * LANPHYPC Value bit to force the interconnect to PCIe mode.
+         */
+        switch (hw->mac.type) {
+        case e1000_pch_lpt:
+                if (e1000_phy_is_accessible_pchlan(hw))
+                        break;
+                /*
+                 * Before toggling LANPHYPC, see if PHY is accessible by
+                 * forcing MAC to SMBus mode first.
+                 */
+                mac_reg = er32(CTRL_EXT);
+                mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;
+                ew32(CTRL_EXT, mac_reg);
+                /* fall-through */
+        case e1000_pch2lan:
+                /*
+                 * Gate automatic PHY configuration by hardware on
+                 * non-managed 82579
+                 */
+                if ((hw->mac.type == e1000_pch2lan) &&
+                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
+                        e1000_gate_hw_phy_config_ich8lan(hw, true);
+                if (e1000_phy_is_accessible_pchlan(hw)) {
+                        if (hw->mac.type == e1000_pch_lpt) {
+                                /* Unforce SMBus mode in PHY */
+                                e1e_rphy_locked(hw, CV_SMB_CTRL, &phy_reg);
+                                phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
+                                e1e_wphy_locked(hw, CV_SMB_CTRL, phy_reg);
+                                /* Unforce SMBus mode in MAC */
+                                mac_reg = er32(CTRL_EXT);
+                                mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
+                                ew32(CTRL_EXT, mac_reg);
+                        }
+                        break;
+                }
+                /* fall-through */
+        case e1000_pchlan:
+                if ((hw->mac.type == e1000_pchlan) &&
+                    (fwsm & E1000_ICH_FWSM_FW_VALID))
+                        break;
+                if (hw->phy.ops.check_reset_block(hw)) {
+                        e_dbg("Required LANPHYPC toggle blocked by ME\n");
+                        break;
+                }
+                e_dbg("Toggling LANPHYPC\n");
+                /* Set Phy Config Counter to 50msec */
+                mac_reg = er32(FEXTNVM3);
+                mac_reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+                mac_reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+                ew32(FEXTNVM3, mac_reg);
+                /* Toggle LANPHYPC Value bit */
+                mac_reg = er32(CTRL);
+                mac_reg |= E1000_CTRL_LANPHYPC_OVERRIDE;
+                mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
+                ew32(CTRL, mac_reg);
+                e1e_flush();
+                udelay(10);
+                mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+                ew32(CTRL, mac_reg);
+                e1e_flush();
+                if (hw->mac.type < e1000_pch_lpt) {
+                        msleep(50);
+                } else {
+                        u16 count = 20;
+                        do {
+                                usleep_range(5000, 10000);
+                        } while (!(er32(CTRL_EXT) &
+                                   E1000_CTRL_EXT_LPCD) && count--);
+                }
+                break;
+        default:
+                break;
+        }
+        hw->phy.ops.release(hw);
+        /*
+         * Reset the PHY before any access to it.  Doing so, ensures
+         * that the PHY is in a known good state before we read/write
+         * PHY registers.  The generic reset is sufficient here,
+         * because we haven't determined the PHY type yet.
+         */
+        ret_val = e1000e_phy_hw_reset_generic(hw);
+        /* Ungate automatic PHY configuration on non-managed 82579 */
+        if ((hw->mac.type == e1000_pch2lan) &&
+            !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+                usleep_range(10000, 20000);
+                e1000_gate_hw_phy_config_ich8lan(hw, false);
+        }
+        return ret_val;
 }
 /**
@@ -325,70 +497,41 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
        phy->ops.power_down           = e1000_power_down_phy_copper_ich8lan;
        phy->autoneg_mask             = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-        if (!hw->phy.ops.check_reset_block(hw)) {
+        phy->id = e1000_phy_unknown;
-                u32 fwsm = er32(FWSM);
-                /*
-                 * The MAC-PHY interconnect may still be in SMBus mode after
-                 * Sx->S0.  If resetting the PHY is not blocked, toggle the
-                 * LANPHYPC Value bit to force the interconnect to PCIe mode.
-                 */
-                e1000_toggle_lanphypc_value_ich8lan(hw);
-                msleep(50);
-                /*
-                 * Gate automatic PHY configuration by hardware on
-                 * non-managed 82579
-                 */
-                if ((hw->mac.type == e1000_pch2lan) &&
-                    !(fwsm & E1000_ICH_FWSM_FW_VALID))
-                        e1000_gate_hw_phy_config_ich8lan(hw, true);
-                /*
-                 * Reset the PHY before any access to it.  Doing so, ensures
-                 * that the PHY is in a known good state before we read/write
-                 * PHY registers.  The generic reset is sufficient here,
-                 * because we haven't determined the PHY type yet.
-                 */
-                ret_val = e1000e_phy_hw_reset_generic(hw);
-                if (ret_val)
-                        return ret_val;
-                /* Ungate automatic PHY configuration on non-managed 82579 */
+        ret_val = e1000_init_phy_workarounds_pchlan(hw);
-                if ((hw->mac.type == e1000_pch2lan) &&
+        if (ret_val)
-                    !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+                return ret_val;
-                        usleep_range(10000, 20000);
-                        e1000_gate_hw_phy_config_ich8lan(hw, false);
-                }
-        }
-        phy->id = e1000_phy_unknown;
+        if (phy->id == e1000_phy_unknown)
-        switch (hw->mac.type) {
+                switch (hw->mac.type) {
-        default:
+                default:
-                ret_val = e1000e_get_phy_id(hw);
+                        ret_val = e1000e_get_phy_id(hw);
-                if (ret_val)
+                        if (ret_val)
-                        return ret_val;
+                                return ret_val;
-                if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+                        if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
+                                break;
+                        /* fall-through */
+                case e1000_pch2lan:
+                case e1000_pch_lpt:
+                        /*
+                         * In case the PHY needs to be in mdio slow mode,
+                         * set slow mode and try to get the PHY id again.
+                         */
+                        ret_val = e1000_set_mdio_slow_mode_hv(hw);
+                        if (ret_val)
+                                return ret_val;
+                        ret_val = e1000e_get_phy_id(hw);
+                        if (ret_val)
+                                return ret_val;
                        break;
-                /* fall-through */
+                }
-        case e1000_pch2lan:
-                /*
-                 * In case the PHY needs to be in mdio slow mode,
-                 * set slow mode and try to get the PHY id again.
-                 */
-                ret_val = e1000_set_mdio_slow_mode_hv(hw);
-                if (ret_val)
-                        return ret_val;
-                ret_val = e1000e_get_phy_id(hw);
-                if (ret_val)
-                        return ret_val;
-                break;
-        }
        phy->type = e1000e_get_phy_type_from_id(phy->id);
        switch (phy->type) {
        case e1000_phy_82577:
        case e1000_phy_82579:
+        case e1000_phy_i217:
                phy->ops.check_polarity = e1000_check_polarity_82577;
                phy->ops.force_speed_duplex =
                    e1000_phy_force_speed_duplex_82577;
@@ -573,7 +716,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
        /* Adaptive IFS supported */
        mac->adaptive_ifs = true;
-        /* LED operations */
+        /* LED and other operations */
        switch (mac->type) {
        case e1000_ich8lan:
        case e1000_ich9lan:
@@ -592,8 +735,12 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                mac->ops.led_on = e1000_led_on_ich8lan;
                mac->ops.led_off = e1000_led_off_ich8lan;
                break;
-        case e1000_pchlan:
        case e1000_pch2lan:
+                mac->rar_entry_count = E1000_PCH2_RAR_ENTRIES;
+                mac->ops.rar_set = e1000_rar_set_pch2lan;
+                /* fall-through */
+        case e1000_pch_lpt:
+        case e1000_pchlan:
                /* check management mode */
                mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
                /* ID LED init */
@@ -610,12 +757,20 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
                break;
        }
+        if (mac->type == e1000_pch_lpt) {
+                mac->rar_entry_count = E1000_PCH_LPT_RAR_ENTRIES;
+                mac->ops.rar_set = e1000_rar_set_pch_lpt;
+        }
        /* Enable PCS Lock-loss workaround for ICH8 */
        if (mac->type == e1000_ich8lan)
                e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
-        /* Gate automatic PHY configuration by hardware on managed 82579 */
+        /*
-        if ((mac->type == e1000_pch2lan) &&
+         * Gate automatic PHY configuration by hardware on managed
+         * 82579 and i217
+         */
+        if ((mac->type == e1000_pch2lan || mac->type == e1000_pch_lpt) &&
            (er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
                e1000_gate_hw_phy_config_ich8lan(hw, true);
@@ -631,22 +786,50 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
 **/
 static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 {
+        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
        s32 ret_val = 0;
        u16 phy_reg;
-        if (hw->phy.type != e1000_phy_82579)
+        if ((hw->phy.type != e1000_phy_82579) &&
+            (hw->phy.type != e1000_phy_i217))
                return 0;
        ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
        if (ret_val)
                return ret_val;
-        if (hw->dev_spec.ich8lan.eee_disable)
+        if (dev_spec->eee_disable)
                phy_reg &= ~I82579_LPI_CTRL_ENABLE_MASK;
        else
                phy_reg |= I82579_LPI_CTRL_ENABLE_MASK;
-        return e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+        ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+        if (ret_val)
+                return ret_val;
+        if ((hw->phy.type == e1000_phy_i217) && !dev_spec->eee_disable) {
+                /* Save off link partner's EEE ability */
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val)
+                        return ret_val;
+                ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
+                                          I217_EEE_LP_ABILITY);
+                if (ret_val)
+                        goto release;
+                e1e_rphy_locked(hw, I82579_EMI_DATA, &dev_spec->eee_lp_ability);
+                /*
+                 * EEE is not supported in 100Half, so ignore partner's EEE
+                 * in 100 ability if full-duplex is not advertised.
+                 */
+                e1e_rphy_locked(hw, PHY_LP_ABILITY, &phy_reg);
+                if (!(phy_reg & NWAY_LPAR_100TX_FD_CAPS))
+                        dev_spec->eee_lp_ability &= ~I217_EEE_100_SUPPORTED;
+release:
+                hw->phy.ops.release(hw);
+        }
+        return 0;
 }
 /**
@@ -688,6 +871,9 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                        return ret_val;
        }
+        /* Clear link partner's EEE ability */
+        hw->dev_spec.ich8lan.eee_lp_ability = 0;
        if (!link)
                return 0; /* No link detected */
@@ -783,6 +969,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
                break;
        case e1000_pchlan:
        case e1000_pch2lan:
+        case e1000_pch_lpt:
                rc = e1000_init_phy_params_pchlan(hw);
                break;
        default:
@@ -968,6 +1155,145 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
 }
 /**
+ *  e1000_rar_set_pch2lan - Set receive address register
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index: receive address array register
+ *
+ *  Sets the receive address array register at index to the address passed
+ *  in by addr.  For 82579, RAR[0] is the base address register that is to
+ *  contain the MAC address but RAR[1-6] are reserved for manageability (ME).
+ *  Use SHRA[0-3] in place of those reserved for ME.
+ **/
+static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+{
+        u32 rar_low, rar_high;
+        /*
+         * HW expects these in little endian so we reverse the byte order
+         * from network order (big endian) to little endian
+         */
+        rar_low = ((u32)addr[0] |
+                   ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
+        rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
+        if (index == 0) {
+                ew32(RAL(index), rar_low);
+                e1e_flush();
+                ew32(RAH(index), rar_high);
+                e1e_flush();
+                return;
+        }
+        if (index < hw->mac.rar_entry_count) {
+                s32 ret_val;
+                ret_val = e1000_acquire_swflag_ich8lan(hw);
+                if (ret_val)
+                        goto out;
+                ew32(SHRAL(index - 1), rar_low);
+                e1e_flush();
+                ew32(SHRAH(index - 1), rar_high);
+                e1e_flush();
+                e1000_release_swflag_ich8lan(hw);
+                /* verify the register updates */
+                if ((er32(SHRAL(index - 1)) == rar_low) &&
+                    (er32(SHRAH(index - 1)) == rar_high))
+                        return;
+                e_dbg("SHRA[%d] might be locked by ME - FWSM=0x%8.8x\n",
+                      (index - 1), er32(FWSM));
+        }
+out:
+        e_dbg("Failed to write receive address at index %d\n", index);
+}
+/**
+ *  e1000_rar_set_pch_lpt - Set receive address registers
+ *  @hw: pointer to the HW structure
+ *  @addr: pointer to the receive address
+ *  @index: receive address array register
+ *
+ *  Sets the receive address register array at index to the address passed
+ *  in by addr. For LPT, RAR[0] is the base address register that is to
+ *  contain the MAC address. SHRA[0-10] are the shared receive address
+ *  registers that are shared between the Host and manageability engine (ME).
+ **/
+static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+{
+        u32 rar_low, rar_high;
+        u32 wlock_mac;
+        /*
+         * HW expects these in little endian so we reverse the byte order
+         * from network order (big endian) to little endian
+         */
+        rar_low = ((u32)addr[0] | ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) | ((u32)addr[3] << 24));
+        rar_high = ((u32)addr[4] | ((u32)addr[5] << 8));
+        /* If MAC address zero, no need to set the AV bit */
+        if (rar_low || rar_high)
+                rar_high |= E1000_RAH_AV;
+        if (index == 0) {
+                ew32(RAL(index), rar_low);
+                e1e_flush();
+                ew32(RAH(index), rar_high);
+                e1e_flush();
+                return;
+        }
+        /*
+         * The manageability engine (ME) can lock certain SHRAR registers that
+         * it is using - those registers are unavailable for use.
+         */
+        if (index < hw->mac.rar_entry_count) {
+                wlock_mac = er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK;
+                wlock_mac >>= E1000_FWSM_WLOCK_MAC_SHIFT;
+                /* Check if all SHRAR registers are locked */
+                if (wlock_mac == 1)
+                        goto out;
+                if ((wlock_mac == 0) || (index <= wlock_mac)) {
+                        s32 ret_val;
+                        ret_val = e1000_acquire_swflag_ich8lan(hw);
+                        if (ret_val)
+                                goto out;
+                        ew32(SHRAL_PCH_LPT(index - 1), rar_low);
+                        e1e_flush();
+                        ew32(SHRAH_PCH_LPT(index - 1), rar_high);
+                        e1e_flush();
+                        e1000_release_swflag_ich8lan(hw);
+                        /* verify the register updates */
+                        if ((er32(SHRAL_PCH_LPT(index - 1)) == rar_low) &&
+                            (er32(SHRAH_PCH_LPT(index - 1)) == rar_high))
+                                return;
+                }
+        }
+out:
+        e_dbg("Failed to write receive address at index %d\n", index);
+}
+/**
 *  e1000_check_reset_block_ich8lan - Check if PHY reset is blocked
 *  @hw: pointer to the HW structure
 *
@@ -995,6 +1321,8 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
 {
        u16 phy_data;
        u32 strap = er32(STRAP);
+        u32 freq = (strap & E1000_STRAP_SMT_FREQ_MASK) >>
+            E1000_STRAP_SMT_FREQ_SHIFT;
        s32 ret_val = 0;
        strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
@@ -1007,6 +1335,19 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
        phy_data |= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
        phy_data |= HV_SMB_ADDR_PEC_EN | HV_SMB_ADDR_VALID;
+        if (hw->phy.type == e1000_phy_i217) {
+                /* Restore SMBus frequency */
+                if (freq--) {
+                        phy_data &= ~HV_SMB_ADDR_FREQ_MASK;
+                        phy_data |= (freq & (1 << 0)) <<
+                            HV_SMB_ADDR_FREQ_LOW_SHIFT;
+                        phy_data |= (freq & (1 << 1)) <<
+                            (HV_SMB_ADDR_FREQ_HIGH_SHIFT - 1);
+                } else {
+                        e_dbg("Unsupported SMB frequency in PHY\n");
+                }
+        }
        return e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
 }
@@ -1044,6 +1385,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                /* Fall-thru */
        case e1000_pchlan:
        case e1000_pch2lan:
+        case e1000_pch_lpt:
                sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;
                break;
        default:
@@ -1063,10 +1405,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
         * extended configuration before SW configuration
         */
        data = er32(EXTCNF_CTRL);
-        if (!(hw->mac.type == e1000_pch2lan)) {
+        if ((hw->mac.type < e1000_pch2lan) &&
-                if (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE)
+            (data & E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE))
-                        goto release;
+                goto release;
-        }
        cnf_size = er32(EXTCNF_SIZE);
        cnf_size &= E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK;
@@ -1077,9 +1418,9 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
        cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;
        cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
-        if ((!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&
+        if (((hw->mac.type == e1000_pchlan) &&
-            (hw->mac.type == e1000_pchlan)) ||
+             !(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)) ||
-             (hw->mac.type == e1000_pch2lan)) {
+            (hw->mac.type > e1000_pchlan)) {
                /*
                 * HW configures the SMBus address and LEDs when the
                 * OEM and LCD Write Enable bits are set in the NVM.
@@ -1122,8 +1463,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                reg_addr &= PHY_REG_MASK;
                reg_addr |= phy_page;
-                ret_val = phy->ops.write_reg_locked(hw, (u32)reg_addr,
+                ret_val = e1e_wphy_locked(hw, (u32)reg_addr, reg_data);
-                                                    reg_data);
                if (ret_val)
                        goto release;
        }
@@ -1160,8 +1500,8 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
        /* Disable K1 when link is 1Gbps, otherwise use the NVM setting */
        if (link) {
                if (hw->phy.type == e1000_phy_82578) {
-                        ret_val = hw->phy.ops.read_reg_locked(hw, BM_CS_STATUS,
+                        ret_val = e1e_rphy_locked(hw, BM_CS_STATUS,
-                                                                  &status_reg);
+                                                  &status_reg);
                        if (ret_val)
                                goto release;
@@ -1176,8 +1516,7 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                }
                if (hw->phy.type == e1000_phy_82577) {
-                        ret_val = hw->phy.ops.read_reg_locked(hw, HV_M_STATUS,
+                        ret_val = e1e_rphy_locked(hw, HV_M_STATUS, &status_reg);
-                                                                  &status_reg);
                        if (ret_val)
                                goto release;
@@ -1192,15 +1531,13 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
                }
                /* Link stall fix for link up */
-                ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
+                ret_val = e1e_wphy_locked(hw, PHY_REG(770, 19), 0x0100);
-                                                           0x0100);
                if (ret_val)
                        goto release;
        } else {
                /* Link stall fix for link down */
-                ret_val = hw->phy.ops.write_reg_locked(hw, PHY_REG(770, 19),
+                ret_val = e1e_wphy_locked(hw, PHY_REG(770, 19), 0x4100);
-                                                           0x4100);
                if (ret_val)
                        goto release;
        }
@@ -1280,14 +1617,14 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
        u32 mac_reg;
        u16 oem_reg;
-        if ((hw->mac.type != e1000_pch2lan) && (hw->mac.type != e1000_pchlan))
+        if (hw->mac.type < e1000_pchlan)
                return ret_val;
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
                return ret_val;
-        if (!(hw->mac.type == e1000_pch2lan)) {
+        if (hw->mac.type == e1000_pchlan) {
                mac_reg = er32(EXTCNF_CTRL);
                if (mac_reg & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE)
                        goto release;
@@ -1299,7 +1636,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
        mac_reg = er32(PHY_CTRL);
-        ret_val = hw->phy.ops.read_reg_locked(hw, HV_OEM_BITS, &oem_reg);
+        ret_val = e1e_rphy_locked(hw, HV_OEM_BITS, &oem_reg);
        if (ret_val)
                goto release;
@@ -1326,7 +1663,7 @@ static s32 e1000_oem_bits_config_ich8lan(struct e1000_hw *hw, bool d0_state)
            !hw->phy.ops.check_reset_block(hw))
                oem_reg |= HV_OEM_BITS_RESTART_AN;
-        ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
+        ret_val = e1e_wphy_locked(hw, HV_OEM_BITS, oem_reg);
 release:
        hw->phy.ops.release(hw);
@@ -1422,11 +1759,10 @@ static s32 e1000_hv_phy_workarounds_ich8lan(struct e1000_hw *hw)
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
                return ret_val;
-        ret_val = hw->phy.ops.read_reg_locked(hw, BM_PORT_GEN_CFG, &phy_data);
+        ret_val = e1e_rphy_locked(hw, BM_PORT_GEN_CFG, &phy_data);
        if (ret_val)
                goto release;
-        ret_val = hw->phy.ops.write_reg_locked(hw, BM_PORT_GEN_CFG,
+        ret_val = e1e_wphy_locked(hw, BM_PORT_GEN_CFG, phy_data & 0x00FF);
-                                               phy_data & 0x00FF);
 release:
        hw->phy.ops.release(hw);
@@ -1485,7 +1821,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
        u32 mac_reg;
        u16 i;
-        if (hw->mac.type != e1000_pch2lan)
+        if (hw->mac.type < e1000_pch2lan)
                return 0;
        /* disable Rx path while enabling/disabling workaround */
@@ -1658,20 +1994,18 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
        ret_val = hw->phy.ops.acquire(hw);
        if (ret_val)
                return ret_val;
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR, I82579_MSE_THRESHOLD);
-                                               I82579_MSE_THRESHOLD);
        if (ret_val)
                goto release;
        /* set MSE higher to enable link to stay up when noise is high */
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0034);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x0034);
        if (ret_val)
                goto release;
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR, I82579_MSE_LINK_DOWN);
-                                               I82579_MSE_LINK_DOWN);
        if (ret_val)
                goto release;
        /* drop link after 5 times MSE threshold was reached */
-        ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA, 0x0005);
+        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x0005);
 release:
        hw->phy.ops.release(hw);
@@ -1744,7 +2078,7 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
 {
        u32 extcnf_ctrl;
-        if (hw->mac.type != e1000_pch2lan)
+        if (hw->mac.type < e1000_pch2lan)
                return;
        extcnf_ctrl = er32(EXTCNF_CTRL);
@@ -1846,12 +2180,10 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
                        return ret_val;
-                ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
-                                                       I82579_LPI_UPDATE_TIMER);
+                                          I82579_LPI_UPDATE_TIMER);
                if (!ret_val)
-                        ret_val = hw->phy.ops.write_reg_locked(hw,
+                        ret_val = e1e_wphy_locked(hw, I82579_EMI_DATA, 0x1387);
-                                                               I82579_EMI_DATA,
-                                                               0x1387);
                hw->phy.ops.release(hw);
        }
@@ -3071,8 +3403,8 @@ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw)
 static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
 {
        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
-        u16 reg;
+        u16 kum_cfg;
-        u32 ctrl, kab;
+        u32 ctrl, reg;
        s32 ret_val;
        /*
@@ -3106,12 +3438,12 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        }
        if (hw->mac.type == e1000_pchlan) {
-                /* Save the NVM K1 bit setting*/
+                /* Save the NVM K1 bit setting */
-                ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &reg);
+                ret_val = e1000_read_nvm(hw, E1000_NVM_K1_CONFIG, 1, &kum_cfg);
                if (ret_val)
                        return ret_val;
-                if (reg & E1000_NVM_K1_ENABLE)
+                if (kum_cfg & E1000_NVM_K1_ENABLE)
                        dev_spec->nvm_k1_enabled = true;
                else
                        dev_spec->nvm_k1_enabled = false;
@@ -3141,6 +3473,14 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        /* cannot issue a flush here because it hangs the hardware */
        msleep(20);
+        /* Set Phy Config Counter to 50msec */
+        if (hw->mac.type == e1000_pch2lan) {
+                reg = er32(FEXTNVM3);
+                reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+                reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+                ew32(FEXTNVM3, reg);
+        }
        if (!ret_val)
                clear_bit(__E1000_ACCESS_SHARED_RESOURCE, &hw->adapter->state);
@@ -3165,9 +3505,9 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
        ew32(IMC, 0xffffffff);
        er32(ICR);
-        kab = er32(KABGTXD);
+        reg = er32(KABGTXD);
-        kab |= E1000_KABGTXD_BGSQLBIAS;
+        reg |= E1000_KABGTXD_BGSQLBIAS;
-        ew32(KABGTXD, kab);
+        ew32(KABGTXD, reg);
        return 0;
 }
@@ -3320,6 +3660,13 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
         */
        reg = er32(RFCTL);
        reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
+        /*
+         * Disable IPv6 extension header parsing because some malformed
+         * IPv6 headers can hang the Rx.
+         */
+        if (hw->mac.type == e1000_ich8lan)
+                reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
        ew32(RFCTL, reg);
 }
@@ -3370,6 +3717,7 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
        ew32(FCTTV, hw->fc.pause_time);
        if ((hw->phy.type == e1000_phy_82578) ||
            (hw->phy.type == e1000_phy_82579) ||
+            (hw->phy.type == e1000_phy_i217) ||
            (hw->phy.type == e1000_phy_82577)) {
                ew32(FCRTV_PCH, hw->fc.refresh_time);
@@ -3433,6 +3781,7 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)
                break;
        case e1000_phy_82577:
        case e1000_phy_82579:
+        case e1000_phy_i217:
                ret_val = e1000_copper_link_setup_82577(hw);
                if (ret_val)
                        return ret_val;
@@ -3679,14 +4028,88 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw)
 *  the LPLU setting in the NVM or custom setting.  For PCH and newer parts,
 *  the OEM bits PHY register (LED, GbE disable and LPLU configurations) also
 *  needs to be written.
+ *  Parts that support (and are linked to a partner which support) EEE in
+ *  100Mbps should disable LPLU since 100Mbps w/ EEE requires less power
+ *  than 10Mbps w/o EEE.
 **/
 void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 {
+        struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
        u32 phy_ctrl;
        s32 ret_val;
        phy_ctrl = er32(PHY_CTRL);
        phy_ctrl |= E1000_PHY_CTRL_GBE_DISABLE;
+        if (hw->phy.type == e1000_phy_i217) {
+                u16 phy_reg;
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val)
+                        goto out;
+                if (!dev_spec->eee_disable) {
+                        u16 eee_advert;
+                        ret_val = e1e_wphy_locked(hw, I82579_EMI_ADDR,
+                                                  I217_EEE_ADVERTISEMENT);
+                        if (ret_val)
+                                goto release;
+                        e1e_rphy_locked(hw, I82579_EMI_DATA, &eee_advert);
+                        /*
+                         * Disable LPLU if both link partners support 100BaseT
+                         * EEE and 100Full is advertised on both ends of the
+                         * link.
+                         */
+                        if ((eee_advert & I217_EEE_100_SUPPORTED) &&
+                            (dev_spec->eee_lp_ability &
+                             I217_EEE_100_SUPPORTED) &&
+                            (hw->phy.autoneg_advertised & ADVERTISE_100_FULL))
+                                phy_ctrl &= ~(E1000_PHY_CTRL_D0A_LPLU |
+                                              E1000_PHY_CTRL_NOND0A_LPLU);
+                }
+                /*
+                 * For i217 Intel Rapid Start Technology support,
+                 * when the system is going into Sx and no manageability engine
+                 * is present, the driver must configure proxy to reset only on
+                 * power good.  LPI (Low Power Idle) state must also reset only
+                 * on power good, as well as the MTA (Multicast table array).
+                 * The SMBus release must also be disabled on LCD reset.
+                 */
+                if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+                        /* Enable proxy to reset only on power good. */
+                        e1e_rphy_locked(hw, I217_PROXY_CTRL, &phy_reg);
+                        phy_reg |= I217_PROXY_CTRL_AUTO_DISABLE;
+                        e1e_wphy_locked(hw, I217_PROXY_CTRL, phy_reg);
+                        /*
+                         * Set bit enable LPI (EEE) to reset only on
+                         * power good.
+                         */
+                        e1e_rphy_locked(hw, I217_SxCTRL, &phy_reg);
+                        phy_reg |= I217_SxCTRL_MASK;
+                        e1e_wphy_locked(hw, I217_SxCTRL, phy_reg);
+                        /* Disable the SMB release on LCD reset. */
+                        e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
+                        phy_reg &= ~I217_MEMPWR;
+                        e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
+                }
+                /*
+                 * Enable MTA to reset for Intel Rapid Start Technology
+                 * Support
+                 */
+                e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
+                phy_reg |= I217_CGFREG_MASK;
+                e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
+release:
+                hw->phy.ops.release(hw);
+        }
+out:
        ew32(PHY_CTRL, phy_ctrl);
        if (hw->mac.type == e1000_ich8lan)
@@ -3715,44 +4138,61 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 *  on which PHY resets are not blocked, if the PHY registers cannot be
 *  accessed properly by the s/w toggle the LANPHYPC value to power cycle
 *  the PHY.
+ *  On i217, setup Intel Rapid Start Technology.
 **/
 void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 {
-        u16 phy_id1, phy_id2;
        s32 ret_val;
-        if ((hw->mac.type != e1000_pch2lan) ||
+        if (hw->mac.type < e1000_pch2lan)
-            hw->phy.ops.check_reset_block(hw))
                return;
-        ret_val = hw->phy.ops.acquire(hw);
+        ret_val = e1000_init_phy_workarounds_pchlan(hw);
        if (ret_val) {
-                e_dbg("Failed to acquire PHY semaphore in resume\n");
+                e_dbg("Failed to init PHY flow ret_val=%d\n", ret_val);
                return;
        }
-        /* Test access to the PHY registers by reading the ID regs */
+        /*
-        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_id1);
+         * For i217 Intel Rapid Start Technology support when the system
-        if (ret_val)
+         * is transitioning from Sx and no manageability engine is present
-                goto release;
+         * configure SMBus to restore on reset, disable proxy, and enable
-        ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID2, &phy_id2);
+         * the reset on MTA (Multicast table array).
-        if (ret_val)
+         */
-                goto release;
+        if (hw->phy.type == e1000_phy_i217) {
+                u16 phy_reg;
-        if (hw->phy.id == ((u32)(phy_id1 << 16) |
-                           (u32)(phy_id2 & PHY_REVISION_MASK)))
-                goto release;
-        e1000_toggle_lanphypc_value_ich8lan(hw);
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val) {
+                        e_dbg("Failed to setup iRST\n");
+                        return;
+                }
-        hw->phy.ops.release(hw);
+                if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
-        msleep(50);
+                        /*
-        e1000_phy_hw_reset(hw);
+                         * Restore clear on SMB if no manageability engine
-        msleep(50);
+                         * is present
-        return;
+                         */
+                        ret_val = e1e_rphy_locked(hw, I217_MEMPWR, &phy_reg);
+                        if (ret_val)
+                                goto release;
+                        phy_reg |= I217_MEMPWR_MASK;
+                        e1e_wphy_locked(hw, I217_MEMPWR, phy_reg);
+                        /* Disable Proxy */
+                        e1e_wphy_locked(hw, I217_PROXY_CTRL, 0);
+                }
+                /* Enable reset on MTA */
+                ret_val = e1e_rphy_locked(hw, I217_CGFREG, &phy_reg);
+                if (ret_val)
+                        goto release;
+                phy_reg &= ~I217_CGFREG_MASK;
+                e1e_wphy_locked(hw, I217_CGFREG, phy_reg);
 release:
-        hw->phy.ops.release(hw);
+                if (ret_val)
+                        e_dbg("Error %d in resume workarounds\n", ret_val);
+                hw->phy.ops.release(hw);
+        }
 }
 /**
@@ -3993,6 +4433,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
        /* Clear PHY statistics registers */
        if ((hw->phy.type == e1000_phy_82578) ||
            (hw->phy.type == e1000_phy_82579) ||
+            (hw->phy.type == e1000_phy_i217) ||
            (hw->phy.type == e1000_phy_82577)) {
                ret_val = hw->phy.ops.acquire(hw);
                if (ret_val)
@@ -4037,6 +4478,7 @@ static const struct e1000_mac_operations ich8_mac_ops = {
        .setup_physical_interface= e1000_setup_copper_link_ich8lan,
        /* id_led_init dependent on mac type */
        .config_collision_dist  = e1000e_config_collision_dist_generic,
+        .rar_set                = e1000e_rar_set_generic,
 };
 static const struct e1000_phy_operations ich8_phy_ops = {
@@ -4151,3 +4593,22 @@ const struct e1000_info e1000_pch2_info = {
        .phy_ops                = &ich8_phy_ops,
        .nvm_ops                = &ich8_nvm_ops,
 };
+const struct e1000_info e1000_pch_lpt_info = {
+        .mac                    = e1000_pch_lpt,
+        .flags                  = FLAG_IS_ICH
+                                  | FLAG_HAS_WOL
+                                  | FLAG_HAS_CTRLEXT_ON_LOAD
+                                  | FLAG_HAS_AMT
+                                  | FLAG_HAS_FLASH
+                                  | FLAG_HAS_JUMBO_FRAMES
+                                  | FLAG_APME_IN_WUC,
+        .flags2                 = FLAG2_HAS_PHY_STATS
+                                  | FLAG2_HAS_EEE,
+        .pba                    = 26,
+        .max_hw_frame_size      = DEFAULT_JUMBO,
+        .get_variants           = e1000_get_variants_ich8lan,
+        .mac_ops                = &ich8_mac_ops,
+        .phy_ops                = &ich8_phy_ops,
+        .nvm_ops                = &ich8_nvm_ops,
+};
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index d8327499305f..026e8b3ab52e 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -143,12 +143,12 @@ void e1000e_init_rx_addrs(struct e1000_hw *hw, u16 rar_count)
        /* Setup the receive address */
        e_dbg("Programming MAC Address into RAR[0]\n");
-        e1000e_rar_set(hw, hw->mac.addr, 0);
+        hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
        /* Zero out the other (rar_entry_count - 1) receive addresses */
        e_dbg("Clearing RAR[1-%u]\n", rar_count - 1);
        for (i = 1; i < rar_count; i++)
-                e1000e_rar_set(hw, mac_addr, i);
+                hw->mac.ops.rar_set(hw, mac_addr, i);
 }
 /**
@@ -215,13 +215,13 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
         * same as the normal permanent MAC address stored by the HW into the
         * RAR. Do this by mapping this address into RAR0.
         */
-        e1000e_rar_set(hw, alt_mac_addr, 0);
+        hw->mac.ops.rar_set(hw, alt_mac_addr, 0);
        return 0;
 }
 /**
- *  e1000e_rar_set - Set receive address register
+ *  e1000e_rar_set_generic - Set receive address register
 *  @hw: pointer to the HW structure
 *  @addr: pointer to the receive address
 *  @index: receive address array register
@@ -229,7 +229,7 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
 *  Sets the receive address array register at index to the address passed
 *  in by addr.
 **/
-void e1000e_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
+void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
 {
        u32 rar_low, rar_high;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 140fee14b313..f648299c54ea 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -56,7 +56,7 @@
 #define DRV_EXTRAVERSION "-k"
-#define DRV_VERSION "1.10.6" DRV_EXTRAVERSION
+#define DRV_VERSION "2.0.0" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
@@ -79,6 +79,7 @@ static const struct e1000_info *e1000_info_tbl[] = {
        [board_ich10lan]        = &e1000_ich10_info,
        [board_pchlan]          = &e1000_pch_info,
        [board_pch2lan]         = &e1000_pch2_info,
+        [board_pch_lpt]         = &e1000_pch_lpt_info,
 };
 struct e1000_reg_info {
@@ -1084,6 +1085,10 @@ static void e1000_print_hw_hang(struct work_struct *work)
              phy_1000t_status,
              phy_ext_status,
              pci_status);
+        /* Suggest workaround for known h/w issue */
+        if ((hw->mac.type == e1000_pchlan) && (er32(CTRL) & E1000_CTRL_TFCE))
+                e_err("Try turning off Tx pause (flow control) via ethtool\n");
 }
 /**
@@ -2859,8 +2864,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        u32 rctl, rfctl;
        u32 pages = 0;
-        /* Workaround Si errata on 82579 - configure jumbo frame flow */
+        /* Workaround Si errata on PCHx - configure jumbo frame flow */
-        if (hw->mac.type == e1000_pch2lan) {
+        if (hw->mac.type >= e1000_pch2lan) {
                s32 ret_val;
                if (adapter->netdev->mtu > ETH_DATA_LEN)
@@ -2935,6 +2940,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        /* Enable Extended Status in all Receive Descriptors */
        rfctl = er32(RFCTL);
        rfctl |= E1000_RFCTL_EXTEN;
+        ew32(RFCTL, rfctl);
        /*
         * 82571 and greater support packet-split where the protocol
@@ -2960,13 +2966,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
        if (adapter->rx_ps_pages) {
                u32 psrctl = 0;
-                /*
-                 * disable packet split support for IPv6 extension headers,
-                 * because some malformed IPv6 headers can hang the Rx
-                 */
-                rfctl |= (E1000_RFCTL_IPV6_EX_DIS |
-                          E1000_RFCTL_NEW_IPV6_EXT_DIS);
                /* Enable Packet split descriptors */
                rctl |= E1000_RCTL_DTYP_PS;
@@ -3005,7 +3004,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                 */
        }
-        ew32(RFCTL, rfctl);
        ew32(RCTL, rctl);
        /* just started the receive unit, no need to restart */
        adapter->flags &= ~FLAG_RX_RESTART_NOW;
@@ -3209,7 +3207,7 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
                netdev_for_each_uc_addr(ha, netdev) {
                        if (!rar_entries)
                                break;
-                        e1000e_rar_set(hw, ha->addr, rar_entries--);
+                        hw->mac.ops.rar_set(hw, ha->addr, rar_entries--);
                        count++;
                }
        }
@@ -3490,6 +3488,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                fc->refresh_time = 0x1000;
                break;
        case e1000_pch2lan:
+        case e1000_pch_lpt:
                fc->high_water = 0x05C20;
                fc->low_water = 0x05048;
                fc->pause_time = 0x0650;
@@ -4018,6 +4017,7 @@ static int e1000_close(struct net_device *netdev)
 static int e1000_set_mac(struct net_device *netdev, void *p)
 {
        struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
        struct sockaddr *addr = p;
        if (!is_valid_ether_addr(addr->sa_data))
@@ -4026,7 +4026,7 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
        memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len);
-        e1000e_rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
+        hw->mac.ops.rar_set(&adapter->hw, adapter->hw.mac.addr, 0);
        if (adapter->flags & FLAG_RESET_OVERWRITES_LAA) {
                /* activate the work around */
@@ -4040,9 +4040,8 @@ static int e1000_set_mac(struct net_device *netdev, void *p)
                 * are dropped. Eventually the LAA will be in RAR[0] and
                 * RAR[14]
                 */
-                e1000e_rar_set(&adapter->hw,
+                hw->mac.ops.rar_set(&adapter->hw, adapter->hw.mac.addr,
-                              adapter->hw.mac.addr,
+                                    adapter->hw.mac.rar_entry_count - 1);
-                              adapter->hw.mac.rar_entry_count - 1);
        }
        return 0;
@@ -4621,7 +4620,7 @@ link_up:
         * reset from the other port. Set the appropriate LAA in RAR[0]
         */
        if (e1000e_get_laa_state_82571(hw))
-                e1000e_rar_set(hw, adapter->hw.mac.addr, 0);
+                hw->mac.ops.rar_set(hw, adapter->hw.mac.addr, 0);
        if (adapter->flags2 & FLAG2_CHECK_PHY_HANG)
                e1000e_check_82574_phy_workaround(adapter);
@@ -5267,22 +5266,14 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
                return -EINVAL;
        }
-        /* Jumbo frame workaround on 82579 requires CRC be stripped */
+        /* Jumbo frame workaround on 82579 and newer requires CRC be stripped */
-        if ((adapter->hw.mac.type == e1000_pch2lan) &&
+        if ((adapter->hw.mac.type >= e1000_pch2lan) &&
            !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
            (new_mtu > ETH_DATA_LEN)) {
-                e_err("Jumbo Frames not supported on 82579 when CRC stripping is disabled.\n");
+                e_err("Jumbo Frames not supported on this device when CRC stripping is disabled.\n");
                return -EINVAL;
        }
-        /* 82573 Errata 17 */
-        if (((adapter->hw.mac.type == e1000_82573) ||
-             (adapter->hw.mac.type == e1000_82574)) &&
-            (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
-                adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
-                e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
-        }
        while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
                usleep_range(1000, 2000);
        /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
@@ -5676,7 +5667,7 @@ static int __e1000_resume(struct pci_dev *pdev)
                        return err;
        }
-        if (hw->mac.type == e1000_pch2lan)
+        if (hw->mac.type >= e1000_pch2lan)
                e1000_resume_workarounds_pchlan(&adapter->hw);
        e1000e_power_up_phy(adapter);
@@ -6575,6 +6566,9 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_LM), board_pch2lan },
        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH2_LV_V), board_pch2lan },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_LM), board_pch_lpt },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LPT_I217_V), board_pch_lpt },
        { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index bd5ef64b3003..0334d013bc3c 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -639,6 +639,45 @@ s32 e1000e_write_kmrn_reg_locked(struct e1000_hw *hw, u32 offset, u16 data)
 }
 /**
+ *  e1000_set_master_slave_mode - Setup PHY for Master/slave mode
+ *  @hw: pointer to the HW structure
+ *
+ *  Sets up Master/slave mode
+ **/
+static s32 e1000_set_master_slave_mode(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 phy_data;
+        /* Resolve Master/Slave mode */
+        ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &phy_data);
+        if (ret_val)
+                return ret_val;
+        /* load defaults for future use */
+        hw->phy.original_ms_type = (phy_data & CR_1000T_MS_ENABLE) ?
+            ((phy_data & CR_1000T_MS_VALUE) ?
+             e1000_ms_force_master : e1000_ms_force_slave) : e1000_ms_auto;
+        switch (hw->phy.ms_type) {
+        case e1000_ms_force_master:
+                phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_force_slave:
+                phy_data |= CR_1000T_MS_ENABLE;
+                phy_data &= ~(CR_1000T_MS_VALUE);
+                break;
+        case e1000_ms_auto:
+                phy_data &= ~CR_1000T_MS_ENABLE;
+                /* fall-through */
+        default:
+                break;
+        }
+        return e1e_wphy(hw, PHY_1000T_CTRL, phy_data);
+}
+/**
 *  e1000_copper_link_setup_82577 - Setup 82577 PHY for copper link
 *  @hw: pointer to the HW structure
 *
@@ -659,7 +698,11 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
        /* Enable downshift */
        phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
-        return e1e_wphy(hw, I82577_CFG_REG, phy_data);
+        ret_val = e1e_wphy(hw, I82577_CFG_REG, phy_data);
+        if (ret_val)
+                return ret_val;
+        return e1000_set_master_slave_mode(hw);
 }
 /**
@@ -722,8 +765,24 @@ s32 e1000e_copper_link_setup_m88(struct e1000_hw *hw)
                phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
        /* Enable downshift on BM (disabled by default) */
-        if (phy->type == e1000_phy_bm)
+        if (phy->type == e1000_phy_bm) {
+                /* For 82574/82583, first disable then enable downshift */
+                if (phy->id == BME1000_E_PHY_ID_R2) {
+                        phy_data &= ~BME1000_PSCR_ENABLE_DOWNSHIFT;
+                        ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL,
+                                           phy_data);
+                        if (ret_val)
+                                return ret_val;
+                        /* Commit the changes. */
+                        ret_val = e1000e_commit_phy(hw);
+                        if (ret_val) {
+                                e_dbg("Error committing the PHY changes\n");
+                                return ret_val;
+                        }
+                }
                phy_data |= BME1000_PSCR_ENABLE_DOWNSHIFT;
+        }
        ret_val = e1e_wphy(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
        if (ret_val)
@@ -879,31 +938,7 @@ s32 e1000e_copper_link_setup_igp(struct e1000_hw *hw)
                                return ret_val;
                }
-                ret_val = e1e_rphy(hw, PHY_1000T_CTRL, &data);
+                ret_val = e1000_set_master_slave_mode(hw);
-                if (ret_val)
-                        return ret_val;
-                /* load defaults for future use */
-                phy->original_ms_type = (data & CR_1000T_MS_ENABLE) ?
-                        ((data & CR_1000T_MS_VALUE) ?
-                        e1000_ms_force_master :
-                        e1000_ms_force_slave) :
-                        e1000_ms_auto;
-                switch (phy->ms_type) {
-                case e1000_ms_force_master:
-                        data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-                        break;
-                case e1000_ms_force_slave:
-                        data |= CR_1000T_MS_ENABLE;
-                        data &= ~(CR_1000T_MS_VALUE);
-                        break;
-                case e1000_ms_auto:
-                        data &= ~CR_1000T_MS_ENABLE;
-                default:
-                        break;
-                }
-                ret_val = e1e_wphy(hw, PHY_1000T_CTRL, data);
        }
        return ret_val;
@@ -2319,6 +2354,9 @@ enum e1000_phy_type e1000e_get_phy_type_from_id(u32 phy_id)
        case I82579_E_PHY_ID:
                phy_type = e1000_phy_82579;
                break;
+        case I217_E_PHY_ID:
+                phy_type = e1000_phy_i217;
+                break;
        default:
                phy_type = e1000_phy_unknown;
                break;
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 8be1d1b2132e..0708d7eb4668 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o
+              ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o
 ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 8e082f257efb..89cebc812ab9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -331,6 +331,26 @@ struct ixgbe_q_vector {
        /* for dynamic allocation of rings associated with this q_vector */
        struct ixgbe_ring ring[0] ____cacheline_internodealigned_in_smp;
 };
+#ifdef CONFIG_IXGBE_HWMON
+#define IXGBE_HWMON_TYPE_LOC            0
+#define IXGBE_HWMON_TYPE_TEMP           1
+#define IXGBE_HWMON_TYPE_CAUTION        2
+#define IXGBE_HWMON_TYPE_MAX            3
+struct hwmon_attr {
+        struct device_attribute dev_attr;
+        struct ixgbe_hw *hw;
+        struct ixgbe_thermal_diode_data *sensor;
+        char name[12];
+};
+struct hwmon_buff {
+        struct device *device;
+        struct hwmon_attr *hwmon_list;
+        unsigned int n_hwmon;
+};
+#endif /* CONFIG_IXGBE_HWMON */
 /*
 * microsecond values for various ITR rates shifted by 2 to fit itr register
@@ -535,6 +555,10 @@ struct ixgbe_adapter {
        u32 timer_event_accumulator;
        u32 vferr_refcount;
+        struct kobject *info_kobj;
+#ifdef CONFIG_IXGBE_HWMON
+        struct hwmon_buff ixgbe_hwmon_buff;
+#endif /* CONFIG_IXGBE_HWMON */
 };
 struct ixgbe_fdir_filter {
@@ -635,6 +659,8 @@ extern int ixgbe_setup_tc(struct net_device *dev, u8 tc);
 #endif
 extern void ixgbe_tx_ctxtdesc(struct ixgbe_ring *, u32, u32, u32, u32);
 extern void ixgbe_do_reset(struct net_device *netdev);
+extern void ixgbe_sysfs_exit(struct ixgbe_adapter *adapter);
+extern int ixgbe_sysfs_init(struct ixgbe_adapter *adapter);
 #ifdef IXGBE_FCOE
 extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);
 extern int ixgbe_fso(struct ixgbe_ring *tx_ring,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index 56fd46844f65..42537336110c 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -324,24 +324,33 @@ out:
 /**
 *  ixgbe_fc_enable_82598 - Enable flow control
 *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
 *
 *  Enable flow control according to the current settings.
 **/
-static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
+static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw)
 {
        s32 ret_val = 0;
        u32 fctrl_reg;
        u32 rmcs_reg;
        u32 reg;
+        u32 fcrtl, fcrth;
        u32 link_speed = 0;
+        int i;
        bool link_up;
-#ifdef CONFIG_DCB
+        /*
-        if (hw->fc.requested_mode == ixgbe_fc_pfc)
+         * Validate the water mark configuration for packet buffer 0.  Zero
+         * water marks indicate that the packet buffer was not configured
+         * and the watermarks for packet buffer 0 should always be configured.
+         */
+        if (!hw->fc.low_water ||
+            !hw->fc.high_water[0] ||
+            !hw->fc.pause_time) {
+                hw_dbg(hw, "Invalid water mark configuration\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                goto out;
+        }
-#endif /* CONFIG_DCB */
        /*
         * On 82598 having Rx FC on causes resets while doing 1G
         * so if it's on turn it off once we know link_speed. For
@@ -363,9 +372,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
        }
        /* Negotiate the fc mode to use */
-        ret_val = ixgbe_fc_autoneg(hw);
+        ixgbe_fc_autoneg(hw);
-        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-                goto out;
        /* Disable any previous flow control settings */
        fctrl_reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
@@ -382,9 +389,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
         * 2: Tx flow control is enabled (we can send pause frames but
         *     we do not support receiving pause frames).
         * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
         * other: Invalid.
         */
        switch (hw->fc.current_mode) {
@@ -417,11 +421,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
                fctrl_reg |= IXGBE_FCTRL_RFCE;
                rmcs_reg |= IXGBE_RMCS_TFCE_802_3X;
                break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
        default:
                hw_dbg(hw, "Flow control param set incorrectly\n");
                ret_val = IXGBE_ERR_CONFIG;
@@ -434,29 +433,29 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl_reg);
        IXGBE_WRITE_REG(hw, IXGBE_RMCS, rmcs_reg);
-        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
-        if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
-                reg = hw->fc.low_water << 6;
-                if (hw->fc.send_xon)
-                        reg |= IXGBE_FCRTL_XONE;
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);
-                reg = hw->fc.high_water[packetbuf_num] << 6;
+        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
-                reg |= IXGBE_FCRTH_FCEN;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if ((hw->fc.current_mode & ixgbe_fc_tx_pause) &&
+                    hw->fc.high_water[i]) {
+                        fcrth = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), fcrtl);
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), fcrth);
+                } else {
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), 0);
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), 0);
+                }
-                IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);
        }
        /* Configure pause time (2 TCs per register) */
-        reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
+        reg = hw->fc.pause_time * 0x00010001;
-        if ((packetbuf_num & 1) == 0)
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
-                reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
-        else
-                reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+        /* Configure flow control refresh threshold value */
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 out:
        return ret_val;
@@ -1277,6 +1276,8 @@ static struct ixgbe_mac_operations mac_ops_82598 = {
        .set_fw_drv_ver         = NULL,
        .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
        .release_swfw_sync      = &ixgbe_release_swfw_sync,
+        .get_thermal_sensor_data = NULL,
+        .init_thermal_sensor_thresh = NULL,
 };
 static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
index 9c14685358eb..dee64d2703f0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
@@ -2119,6 +2119,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
        .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
        .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
        .release_swfw_sync      = &ixgbe_release_swfw_sync,
+        .get_thermal_sensor_data = &ixgbe_get_thermal_sensor_data_generic,
+        .init_thermal_sensor_thresh = &ixgbe_init_thermal_sensor_thresh_generic,
 };
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index e59888163a17..c7e51b85b8b6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -47,13 +47,6 @@ static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
 static void ixgbe_release_eeprom(struct ixgbe_hw *hw);
 static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
-static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);
-static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
 static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);
 static s32 ixgbe_read_eeprom_buffer_bit_bang(struct ixgbe_hw *hw, u16 offset,
                                             u16 words, u16 *data);
@@ -64,6 +57,172 @@ static s32 ixgbe_detect_eeprom_page_size_generic(struct ixgbe_hw *hw,
 static s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);
 /**
+ *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
+ *  control
+ *  @hw: pointer to hardware structure
+ *
+ *  There are several phys that do not support autoneg flow control. This
+ *  function check the device id to see if the associated phy supports
+ *  autoneg flow control.
+ **/
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
+{
+        switch (hw->device_id) {
+        case IXGBE_DEV_ID_X540T:
+                return 0;
+        case IXGBE_DEV_ID_82599_T3_LOM:
+                return 0;
+        default:
+                return IXGBE_ERR_FC_NOT_SUPPORTED;
+        }
+}
+/**
+ *  ixgbe_setup_fc - Set up flow control
+ *  @hw: pointer to hardware structure
+ *
+ *  Called at init time to set up flow control.
+ **/
+static s32 ixgbe_setup_fc(struct ixgbe_hw *hw)
+{
+        s32 ret_val = 0;
+        u32 reg = 0, reg_bp = 0;
+        u16 reg_cu = 0;
+        /*
+         * Validate the requested mode.  Strict IEEE mode does not allow
+         * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
+         */
+        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
+                hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict IEEE mode\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
+                goto out;
+        }
+        /*
+         * 10gig parts do not have a word in the EEPROM to determine the
+         * default flow control setting, so we explicitly set it to full.
+         */
+        if (hw->fc.requested_mode == ixgbe_fc_default)
+                hw->fc.requested_mode = ixgbe_fc_full;
+        /*
+         * Set up the 1G and 10G flow control advertisement registers so the
+         * HW will be able to do fc autoneg once the cable is plugged in.  If
+         * we link at 10G, the 1G advertisement is harmless and vice versa.
+         */
+        switch (hw->phy.media_type) {
+        case ixgbe_media_type_fiber:
+        case ixgbe_media_type_backplane:
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+                reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+                break;
+        case ixgbe_media_type_copper:
+                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                        MDIO_MMD_AN, &reg_cu);
+                break;
+        default:
+                break;
+        }
+        /*
+         * The possible values of fc.requested_mode are:
+         * 0: Flow control is completely disabled
+         * 1: Rx flow control is enabled (we can receive pause frames,
+         *    but not send pause frames).
+         * 2: Tx flow control is enabled (we can send pause frames but
+         *    we do not support receiving pause frames).
+         * 3: Both Rx and Tx flow control (symmetric) are enabled.
+         * other: Invalid.
+         */
+        switch (hw->fc.requested_mode) {
+        case ixgbe_fc_none:
+                /* Flow control completely disabled by software override. */
+                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
+                                    IXGBE_AUTOC_ASM_PAUSE);
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
+                break;
+        case ixgbe_fc_tx_pause:
+                /*
+                 * Tx Flow control is enabled, and Rx Flow control is
+                 * disabled by software override.
+                 */
+                reg |= IXGBE_PCS1GANA_ASM_PAUSE;
+                reg &= ~IXGBE_PCS1GANA_SYM_PAUSE;
+                if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                        reg_bp |= IXGBE_AUTOC_ASM_PAUSE;
+                        reg_bp &= ~IXGBE_AUTOC_SYM_PAUSE;
+                } else if (hw->phy.media_type == ixgbe_media_type_copper) {
+                        reg_cu |= IXGBE_TAF_ASM_PAUSE;
+                        reg_cu &= ~IXGBE_TAF_SYM_PAUSE;
+                }
+                break;
+        case ixgbe_fc_rx_pause:
+                /*
+                 * Rx Flow control is enabled and Tx Flow control is
+                 * disabled by software override. Since there really
+                 * isn't a way to advertise that we are capable of RX
+                 * Pause ONLY, we will advertise that we support both
+                 * symmetric and asymmetric Rx PAUSE, as such we fall
+                 * through to the fc_full statement.  Later, we will
+                 * disable the adapter's ability to send PAUSE frames.
+                 */
+        case ixgbe_fc_full:
+                /* Flow control (both Rx and Tx) is enabled by SW override. */
+                reg |= IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE;
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp |= IXGBE_AUTOC_SYM_PAUSE |
+                                  IXGBE_AUTOC_ASM_PAUSE;
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu |= IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE;
+                break;
+        default:
+                hw_dbg(hw, "Flow control param set incorrectly\n");
+                ret_val = IXGBE_ERR_CONFIG;
+                goto out;
+                break;
+        }
+        if (hw->mac.type != ixgbe_mac_X540) {
+                /*
+                 * Enable auto-negotiation between the MAC & PHY;
+                 * the MAC will advertise clause 37 flow control.
+                 */
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
+                /* Disable AN timeout */
+                if (hw->fc.strict_ieee)
+                        reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
+                hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
+        }
+        /*
+         * AUTOC restart handles negotiation of 1G and 10G on backplane
+         * and copper. There is no need to set the PCS1GCTL register.
+         *
+         */
+        if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                reg_bp |= IXGBE_AUTOC_AN_RESTART;
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
+        } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
+                    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
+                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                      MDIO_MMD_AN, reg_cu);
+        }
+        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
+out:
+        return ret_val;
+}
+/**
 *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
 *  @hw: pointer to hardware structure
 *
@@ -95,7 +254,7 @@ s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw)
        IXGBE_WRITE_FLUSH(hw);
        /* Setup flow control */
-        ixgbe_setup_fc(hw, 0);
+        ixgbe_setup_fc(hw);
        /* Clear adapter stopped flag */
        hw->adapter_stopped = false;
@@ -1923,30 +2082,36 @@ s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)
 /**
 *  ixgbe_fc_enable_generic - Enable flow control
 *  @hw: pointer to hardware structure
- *  @packetbuf_num: packet buffer number (0-7)
 *
 *  Enable flow control according to the current settings.
 **/
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw)
 {
        s32 ret_val = 0;
        u32 mflcn_reg, fccfg_reg;
        u32 reg;
        u32 fcrtl, fcrth;
+        int i;
-#ifdef CONFIG_DCB
+        /*
-        if (hw->fc.requested_mode == ixgbe_fc_pfc)
+         * Validate the water mark configuration for packet buffer 0.  Zero
+         * water marks indicate that the packet buffer was not configured
+         * and the watermarks for packet buffer 0 should always be configured.
+         */
+        if (!hw->fc.low_water ||
+            !hw->fc.high_water[0] ||
+            !hw->fc.pause_time) {
+                hw_dbg(hw, "Invalid water mark configuration\n");
+                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                goto out;
+        }
-#endif /* CONFIG_DCB */
        /* Negotiate the fc mode to use */
-        ret_val = ixgbe_fc_autoneg(hw);
+        ixgbe_fc_autoneg(hw);
-        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
-                goto out;
        /* Disable any previous flow control settings */
        mflcn_reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-        mflcn_reg &= ~(IXGBE_MFLCN_RFCE | IXGBE_MFLCN_RPFCE);
+        mflcn_reg &= ~(IXGBE_MFLCN_RPFCE_MASK | IXGBE_MFLCN_RFCE);
        fccfg_reg = IXGBE_READ_REG(hw, IXGBE_FCCFG);
        fccfg_reg &= ~(IXGBE_FCCFG_TFCE_802_3X | IXGBE_FCCFG_TFCE_PRIORITY);
@@ -1959,9 +2124,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
         * 2: Tx flow control is enabled (we can send pause frames but
         *    we do not support receiving pause frames).
         * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
         * other: Invalid.
         */
        switch (hw->fc.current_mode) {
@@ -1994,11 +2156,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
                mflcn_reg |= IXGBE_MFLCN_RFCE;
                fccfg_reg |= IXGBE_FCCFG_TFCE_802_3X;
                break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
        default:
                hw_dbg(hw, "Flow control param set incorrectly\n");
                ret_val = IXGBE_ERR_CONFIG;
@@ -2011,100 +2168,86 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn_reg);
        IXGBE_WRITE_REG(hw, IXGBE_FCCFG, fccfg_reg);
-        fcrtl = hw->fc.low_water << 10;
+        fcrtl = (hw->fc.low_water << 10) | IXGBE_FCRTL_XONE;
-        if (hw->fc.current_mode & ixgbe_fc_tx_pause) {
+        /* Set up and enable Rx high/low water mark thresholds, enable XON. */
-                fcrth = hw->fc.high_water[packetbuf_num] << 10;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                fcrth |= IXGBE_FCRTH_FCEN;
+                if ((hw->fc.current_mode & ixgbe_fc_tx_pause) &&
-                if (hw->fc.send_xon)
+                    hw->fc.high_water[i]) {
-                        fcrtl |= IXGBE_FCRTL_XONE;
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), fcrtl);
-        } else {
+                        fcrth = (hw->fc.high_water[i] << 10) | IXGBE_FCRTH_FCEN;
-                /*
+                } else {
-                 * If Tx flow control is disabled, set our high water mark
+                        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), 0);
-                 * to Rx FIFO size minus 32 in order prevent Tx switch
+                        /*
-                 * loopback from stalling on DMA.
+                         * In order to prevent Tx hangs when the internal Tx
-                 */
+                         * switch is enabled we must set the high water mark
-                fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num)) - 32;
+                         * to the maximum FCRTH value.  This allows the Tx
-        }
+                         * switch to function even under heavy Rx workloads.
+                         */
+                        fcrth = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i)) - 32;
+                }
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(packetbuf_num), fcrth);
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), fcrth);
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(packetbuf_num), fcrtl);
+        }
        /* Configure pause time (2 TCs per register) */
-        reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));
+        reg = hw->fc.pause_time * 0x00010001;
-        if ((packetbuf_num & 1) == 0)
+        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
-                reg = (reg & 0xFFFF0000) | hw->fc.pause_time;
+                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
-        else
-                reg = (reg & 0x0000FFFF) | (hw->fc.pause_time << 16);
-        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(packetbuf_num / 2), reg);
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, (hw->fc.pause_time >> 1));
+        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
 out:
        return ret_val;
 }
 /**
- *  ixgbe_fc_autoneg - Configure flow control
+ *  ixgbe_negotiate_fc - Negotiate flow control
 *  @hw: pointer to hardware structure
+ *  @adv_reg: flow control advertised settings
+ *  @lp_reg: link partner's flow control settings
+ *  @adv_sym: symmetric pause bit in advertisement
+ *  @adv_asm: asymmetric pause bit in advertisement
+ *  @lp_sym: symmetric pause bit in link partner advertisement
+ *  @lp_asm: asymmetric pause bit in link partner advertisement
 *
- *  Compares our advertised flow control capabilities to those advertised by
+ *  Find the intersection between advertised settings and link partner's
- *  our link partner, and determines the proper flow control mode to use.
+ *  advertised settings
 **/
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
 {
-        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+        if ((!(adv_reg)) ||  (!(lp_reg)))
-        ixgbe_link_speed speed;
+                return IXGBE_ERR_FC_NOT_NEGOTIATED;
-        bool link_up;
-        if (hw->fc.disable_fc_autoneg)
-                goto out;
-        /*
-         * AN should have completed when the cable was plugged in.
-         * Look for reasons to bail out.  Bail out if:
-         * - FC autoneg is disabled, or if
-         * - link is not up.
-         *
-         * Since we're being called from an LSC, link is already known to be up.
-         * So use link_up_wait_to_complete=false.
-         */
-        hw->mac.ops.check_link(hw, &speed, &link_up, false);
-        if (!link_up) {
-                ret_val = IXGBE_ERR_FLOW_CONTROL;
-                goto out;
-        }
-        switch (hw->phy.media_type) {
-        /* Autoneg flow control on fiber adapters */
-        case ixgbe_media_type_fiber:
-                if (speed == IXGBE_LINK_SPEED_1GB_FULL)
-                        ret_val = ixgbe_fc_autoneg_fiber(hw);
-                break;
-        /* Autoneg flow control on backplane adapters */
-        case ixgbe_media_type_backplane:
-                ret_val = ixgbe_fc_autoneg_backplane(hw);
-                break;
-        /* Autoneg flow control on copper adapters */
-        case ixgbe_media_type_copper:
-                if (ixgbe_device_supports_autoneg_fc(hw) == 0)
-                        ret_val = ixgbe_fc_autoneg_copper(hw);
-                break;
-        default:
-                break;
-        }
-out:
+        if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
-        if (ret_val == 0) {
+                /*
-                hw->fc.fc_was_autonegged = true;
+                 * Now we need to check if the user selected Rx ONLY
+                 * of pause frames.  In this case, we had to advertise
+                 * FULL flow control because we could not advertise RX
+                 * ONLY. Hence, we must now check to see if we need to
+                 * turn OFF the TRANSMISSION of PAUSE frames.
+                 */
+                if (hw->fc.requested_mode == ixgbe_fc_full) {
+                        hw->fc.current_mode = ixgbe_fc_full;
+                        hw_dbg(hw, "Flow Control = FULL.\n");
+                } else {
+                        hw->fc.current_mode = ixgbe_fc_rx_pause;
+                        hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
+                }
+        } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_tx_pause;
+                hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
+        } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_rx_pause;
+                hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
        } else {
-                hw->fc.fc_was_autonegged = false;
+                hw->fc.current_mode = ixgbe_fc_none;
-                hw->fc.current_mode = hw->fc.requested_mode;
+                hw_dbg(hw, "Flow Control = NONE.\n");
        }
-        return ret_val;
+        return 0;
 }
 /**
@@ -2116,7 +2259,7 @@ out:
 static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
 {
        u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
-        s32 ret_val;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
        /*
         * On multispeed fiber at 1g, bail out if
@@ -2126,10 +2269,8 @@ static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
        linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
        if ((!!(linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
-            (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
+            (!!(linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1))
-                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
                goto out;
-        }
        pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
        pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
@@ -2153,7 +2294,7 @@ out:
 static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
 {
        u32 links2, anlp1_reg, autoc_reg, links;
-        s32 ret_val;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
        /*
         * On backplane, bail out if
@@ -2161,21 +2302,13 @@ static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
         * - we are 82599 and link partner is not AN enabled
         */
        links = IXGBE_READ_REG(hw, IXGBE_LINKS);
-        if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
+        if ((links & IXGBE_LINKS_KX_AN_COMP) == 0)
-                hw->fc.fc_was_autonegged = false;
-                hw->fc.current_mode = hw->fc.requested_mode;
-                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
                goto out;
-        }
        if (hw->mac.type == ixgbe_mac_82599EB) {
                links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
-                if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
+                if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0)
-                        hw->fc.fc_was_autonegged = false;
-                        hw->fc.current_mode = hw->fc.requested_mode;
-                        ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
                        goto out;
-                }
        }
        /*
         * Read the 10g AN autoc and LP ability registers and resolve
@@ -2217,241 +2350,63 @@ static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)
 }
 /**
- *  ixgbe_negotiate_fc - Negotiate flow control
+ *  ixgbe_fc_autoneg - Configure flow control
- *  @hw: pointer to hardware structure
- *  @adv_reg: flow control advertised settings
- *  @lp_reg: link partner's flow control settings
- *  @adv_sym: symmetric pause bit in advertisement
- *  @adv_asm: asymmetric pause bit in advertisement
- *  @lp_sym: symmetric pause bit in link partner advertisement
- *  @lp_asm: asymmetric pause bit in link partner advertisement
- *
- *  Find the intersection between advertised settings and link partner's
- *  advertised settings
- **/
-static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
-                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
-{
-        if ((!(adv_reg)) ||  (!(lp_reg)))
-                return IXGBE_ERR_FC_NOT_NEGOTIATED;
-        if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
-                /*
-                 * Now we need to check if the user selected Rx ONLY
-                 * of pause frames.  In this case, we had to advertise
-                 * FULL flow control because we could not advertise RX
-                 * ONLY. Hence, we must now check to see if we need to
-                 * turn OFF the TRANSMISSION of PAUSE frames.
-                 */
-                if (hw->fc.requested_mode == ixgbe_fc_full) {
-                        hw->fc.current_mode = ixgbe_fc_full;
-                        hw_dbg(hw, "Flow Control = FULL.\n");
-                } else {
-                        hw->fc.current_mode = ixgbe_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
-                }
-        } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-                hw->fc.current_mode = ixgbe_fc_tx_pause;
-                hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
-        } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
-                   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
-                hw->fc.current_mode = ixgbe_fc_rx_pause;
-                hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
-        } else {
-                hw->fc.current_mode = ixgbe_fc_none;
-                hw_dbg(hw, "Flow Control = NONE.\n");
-        }
-        return 0;
-}
-/**
- *  ixgbe_setup_fc - Set up flow control
 *  @hw: pointer to hardware structure
 *
- *  Called at init time to set up flow control.
+ *  Compares our advertised flow control capabilities to those advertised by
+ *  our link partner, and determines the proper flow control mode to use.
 **/
-static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
+void ixgbe_fc_autoneg(struct ixgbe_hw *hw)
 {
-        s32 ret_val = 0;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
-        u32 reg = 0, reg_bp = 0;
+        ixgbe_link_speed speed;
-        u16 reg_cu = 0;
+        bool link_up;
-#ifdef CONFIG_DCB
-        if (hw->fc.requested_mode == ixgbe_fc_pfc) {
-                hw->fc.current_mode = hw->fc.requested_mode;
-                goto out;
-        }
-#endif /* CONFIG_DCB */
-        /* Validate the packetbuf configuration */
-        if (packetbuf_num < 0 || packetbuf_num > 7) {
-                hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
-                       "is 0-7\n", packetbuf_num);
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
-                goto out;
-        }
        /*
-         * Validate the water mark configuration.  Zero water marks are invalid
+         * AN should have completed when the cable was plugged in.
-         * because it causes the controller to just blast out fc packets.
+         * Look for reasons to bail out.  Bail out if:
+         * - FC autoneg is disabled, or if
+         * - link is not up.
+         *
+         * Since we're being called from an LSC, link is already known to be up.
+         * So use link_up_wait_to_complete=false.
         */
-        if (!hw->fc.low_water ||
+        if (hw->fc.disable_fc_autoneg)
-            !hw->fc.high_water[packetbuf_num] ||
-            !hw->fc.pause_time) {
-                hw_dbg(hw, "Invalid water mark configuration\n");
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                goto out;
-        }
-        /*
+        hw->mac.ops.check_link(hw, &speed, &link_up, false);
-         * Validate the requested mode.  Strict IEEE mode does not allow
+        if (!link_up)
-         * ixgbe_fc_rx_pause because it will cause us to fail at UNH.
-         */
-        if (hw->fc.strict_ieee && hw->fc.requested_mode == ixgbe_fc_rx_pause) {
-                hw_dbg(hw, "ixgbe_fc_rx_pause not valid in strict "
-                       "IEEE mode\n");
-                ret_val = IXGBE_ERR_INVALID_LINK_SETTINGS;
                goto out;
-        }
-        /*
-         * 10gig parts do not have a word in the EEPROM to determine the
-         * default flow control setting, so we explicitly set it to full.
-         */
-        if (hw->fc.requested_mode == ixgbe_fc_default)
-                hw->fc.requested_mode = ixgbe_fc_full;
-        /*
-         * Set up the 1G and 10G flow control advertisement registers so the
-         * HW will be able to do fc autoneg once the cable is plugged in.  If
-         * we link at 10G, the 1G advertisement is harmless and vice versa.
-         */
        switch (hw->phy.media_type) {
+        /* Autoneg flow control on fiber adapters */
        case ixgbe_media_type_fiber:
+                if (speed == IXGBE_LINK_SPEED_1GB_FULL)
+                        ret_val = ixgbe_fc_autoneg_fiber(hw);
+                break;
+        /* Autoneg flow control on backplane adapters */
        case ixgbe_media_type_backplane:
-                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+                ret_val = ixgbe_fc_autoneg_backplane(hw);
-                reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
                break;
+        /* Autoneg flow control on copper adapters */
        case ixgbe_media_type_copper:
-                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                if (ixgbe_device_supports_autoneg_fc(hw) == 0)
-                                        MDIO_MMD_AN, &reg_cu);
+                        ret_val = ixgbe_fc_autoneg_copper(hw);
                break;
        default:
-                ;
-        }
-        /*
-         * The possible values of fc.requested_mode are:
-         * 0: Flow control is completely disabled
-         * 1: Rx flow control is enabled (we can receive pause frames,
-         *    but not send pause frames).
-         * 2: Tx flow control is enabled (we can send pause frames but
-         *    we do not support receiving pause frames).
-         * 3: Both Rx and Tx flow control (symmetric) are enabled.
-#ifdef CONFIG_DCB
-         * 4: Priority Flow Control is enabled.
-#endif
-         * other: Invalid.
-         */
-        switch (hw->fc.requested_mode) {
-        case ixgbe_fc_none:
-                /* Flow control completely disabled by software override. */
-                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
-                                    IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-        case ixgbe_fc_rx_pause:
-                /*
-                 * Rx Flow control is enabled and Tx Flow control is
-                 * disabled by software override. Since there really
-                 * isn't a way to advertise that we are capable of RX
-                 * Pause ONLY, we will advertise that we support both
-                 * symmetric and asymmetric Rx PAUSE.  Later, we will
-                 * disable the adapter's ability to send PAUSE frames.
-                 */
-                reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                   IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-        case ixgbe_fc_tx_pause:
-                /*
-                 * Tx Flow control is enabled, and Rx Flow control is
-                 * disabled by software override.
-                 */
-                reg |= (IXGBE_PCS1GANA_ASM_PAUSE);
-                reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                        reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);
-                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);
-                } else if (hw->phy.media_type == ixgbe_media_type_copper) {
-                        reg_cu |= (IXGBE_TAF_ASM_PAUSE);
-                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);
-                }
-                break;
-        case ixgbe_fc_full:
-                /* Flow control (both Rx and Tx) is enabled by SW override. */
-                reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
-                if (hw->phy.media_type == ixgbe_media_type_backplane)
-                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
-                                   IXGBE_AUTOC_ASM_PAUSE);
-                else if (hw->phy.media_type == ixgbe_media_type_copper)
-                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
-                break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
-        default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
-                ret_val = IXGBE_ERR_CONFIG;
-                goto out;
                break;
        }
-        if (hw->mac.type != ixgbe_mac_X540) {
-                /*
-                 * Enable auto-negotiation between the MAC & PHY;
-                 * the MAC will advertise clause 37 flow control.
-                 */
-                IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
-                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
-                /* Disable AN timeout */
-                if (hw->fc.strict_ieee)
-                        reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
-                IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
-                hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
-        }
-        /*
-         * AUTOC restart handles negotiation of 1G and 10G on backplane
-         * and copper. There is no need to set the PCS1GCTL register.
-         *
-         */
-        if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                reg_bp |= IXGBE_AUTOC_AN_RESTART;
-                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
-        } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
-                    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
-                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
-                                      MDIO_MMD_AN, reg_cu);
-        }
-        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
 out:
-        return ret_val;
+        if (ret_val == 0) {
+                hw->fc.fc_was_autonegged = true;
+        } else {
+                hw->fc.fc_was_autonegged = false;
+                hw->fc.current_mode = hw->fc.requested_mode;
+        }
 }
 /**
@@ -3222,28 +3177,6 @@ wwn_prefix_out:
 }
 /**
- *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
- *  control
- *  @hw: pointer to hardware structure
- *
- *  There are several phys that do not support autoneg flow control. This
- *  function check the device id to see if the associated phy supports
- *  autoneg flow control.
- **/
-static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
-{
-        switch (hw->device_id) {
-        case IXGBE_DEV_ID_X540T:
-                return 0;
-        case IXGBE_DEV_ID_82599_T3_LOM:
-                return 0;
-        default:
-                return IXGBE_ERR_FC_NOT_SUPPORTED;
-        }
-}
-/**
 *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing
 *  @hw: pointer to hardware structure
 *  @enable: enable or disable switch for anti-spoofing
@@ -3604,3 +3537,172 @@ void ixgbe_clear_tx_pending(struct ixgbe_hw *hw)
        IXGBE_WRITE_REG(hw, IXGBE_GCR_EXT, gcr_ext);
        IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
 }
+static const u8 ixgbe_emc_temp_data[4] = {
+        IXGBE_EMC_INTERNAL_DATA,
+        IXGBE_EMC_DIODE1_DATA,
+        IXGBE_EMC_DIODE2_DATA,
+        IXGBE_EMC_DIODE3_DATA
+};
+static const u8 ixgbe_emc_therm_limit[4] = {
+        IXGBE_EMC_INTERNAL_THERM_LIMIT,
+        IXGBE_EMC_DIODE1_THERM_LIMIT,
+        IXGBE_EMC_DIODE2_THERM_LIMIT,
+        IXGBE_EMC_DIODE3_THERM_LIMIT
+};
+/**
+ *  ixgbe_get_ets_data - Extracts the ETS bit data
+ *  @hw: pointer to hardware structure
+ *  @ets_cfg: extected ETS data
+ *  @ets_offset: offset of ETS data
+ *
+ *  Returns error code.
+ **/
+static s32 ixgbe_get_ets_data(struct ixgbe_hw *hw, u16 *ets_cfg,
+                              u16 *ets_offset)
+{
+        s32 status = 0;
+        status = hw->eeprom.ops.read(hw, IXGBE_ETS_CFG, ets_offset);
+        if (status)
+                goto out;
+        if ((*ets_offset == 0x0000) || (*ets_offset == 0xFFFF)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+        status = hw->eeprom.ops.read(hw, *ets_offset, ets_cfg);
+        if (status)
+                goto out;
+        if ((*ets_cfg & IXGBE_ETS_TYPE_MASK) != IXGBE_ETS_TYPE_EMC_SHIFTED) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+out:
+        return status;
+}
+/**
+ *  ixgbe_get_thermal_sensor_data - Gathers thermal sensor data
+ *  @hw: pointer to hardware structure
+ *
+ *  Returns the thermal sensor data structure
+ **/
+s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw)
+{
+        s32 status = 0;
+        u16 ets_offset;
+        u16 ets_cfg;
+        u16 ets_sensor;
+        u8  num_sensors;
+        u8  i;
+        struct ixgbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
+        /* Only support thermal sensors attached to physical port 0 */
+        if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+        status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);
+        if (status)
+                goto out;
+        num_sensors = (ets_cfg & IXGBE_ETS_NUM_SENSORS_MASK);
+        if (num_sensors > IXGBE_MAX_SENSORS)
+                num_sensors = IXGBE_MAX_SENSORS;
+        for (i = 0; i < num_sensors; i++) {
+                u8  sensor_index;
+                u8  sensor_location;
+                status = hw->eeprom.ops.read(hw, (ets_offset + 1 + i),
+                                             &ets_sensor);
+                if (status)
+                        goto out;
+                sensor_index = ((ets_sensor & IXGBE_ETS_DATA_INDEX_MASK) >>
+                                IXGBE_ETS_DATA_INDEX_SHIFT);
+                sensor_location = ((ets_sensor & IXGBE_ETS_DATA_LOC_MASK) >>
+                                   IXGBE_ETS_DATA_LOC_SHIFT);
+                if (sensor_location != 0) {
+                        status = hw->phy.ops.read_i2c_byte(hw,
+                                        ixgbe_emc_temp_data[sensor_index],
+                                        IXGBE_I2C_THERMAL_SENSOR_ADDR,
+                                        &data->sensor[i].temp);
+                        if (status)
+                                goto out;
+                }
+        }
+out:
+        return status;
+}
+/**
+ * ixgbe_init_thermal_sensor_thresh_generic - Inits thermal sensor thresholds
+ * @hw: pointer to hardware structure
+ *
+ * Inits the thermal sensor thresholds according to the NVM map
+ * and save off the threshold and location values into mac.thermal_sensor_data
+ **/
+s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw)
+{
+        s32 status = 0;
+        u16 ets_offset;
+        u16 ets_cfg;
+        u16 ets_sensor;
+        u8  low_thresh_delta;
+        u8  num_sensors;
+        u8  therm_limit;
+        u8  i;
+        struct ixgbe_thermal_sensor_data *data = &hw->mac.thermal_sensor_data;
+        memset(data, 0, sizeof(struct ixgbe_thermal_sensor_data));
+        /* Only support thermal sensors attached to physical port 0 */
+        if ((IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)) {
+                status = IXGBE_NOT_IMPLEMENTED;
+                goto out;
+        }
+        status = ixgbe_get_ets_data(hw, &ets_cfg, &ets_offset);
+        if (status)
+                goto out;
+        low_thresh_delta = ((ets_cfg & IXGBE_ETS_LTHRES_DELTA_MASK) >>
+                             IXGBE_ETS_LTHRES_DELTA_SHIFT);
+        num_sensors = (ets_cfg & IXGBE_ETS_NUM_SENSORS_MASK);
+        if (num_sensors > IXGBE_MAX_SENSORS)
+                num_sensors = IXGBE_MAX_SENSORS;
+        for (i = 0; i < num_sensors; i++) {
+                u8  sensor_index;
+                u8  sensor_location;
+                hw->eeprom.ops.read(hw, (ets_offset + 1 + i), &ets_sensor);
+                sensor_index = ((ets_sensor & IXGBE_ETS_DATA_INDEX_MASK) >>
+                                IXGBE_ETS_DATA_INDEX_SHIFT);
+                sensor_location = ((ets_sensor & IXGBE_ETS_DATA_LOC_MASK) >>
+                                   IXGBE_ETS_DATA_LOC_SHIFT);
+                therm_limit = ets_sensor & IXGBE_ETS_DATA_HTHRESH_MASK;
+                hw->phy.ops.write_i2c_byte(hw,
+                        ixgbe_emc_therm_limit[sensor_index],
+                        IXGBE_I2C_THERMAL_SENSOR_ADDR, therm_limit);
+                if (sensor_location == 0)
+                        continue;
+                data->sensor[i].location = sensor_location;
+                data->sensor[i].caution_thresh = therm_limit;
+                data->sensor[i].max_op_thresh = therm_limit - low_thresh_delta;
+        }
+out:
+        return status;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
index d6d34324540c..6222fdb3d3f1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
@@ -77,8 +77,8 @@ s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_disable_rx_buff_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_buff_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
-s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num);
+s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw);
-s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw);
+void ixgbe_fc_autoneg(struct ixgbe_hw *hw);
 s32 ixgbe_validate_mac_addr(u8 *mac_addr);
 s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);
@@ -107,6 +107,19 @@ void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);
 void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb,
                             u32 headroom, int strategy);
+#define IXGBE_I2C_THERMAL_SENSOR_ADDR   0xF8
+#define IXGBE_EMC_INTERNAL_DATA         0x00
+#define IXGBE_EMC_INTERNAL_THERM_LIMIT  0x20
+#define IXGBE_EMC_DIODE1_DATA           0x01
+#define IXGBE_EMC_DIODE1_THERM_LIMIT    0x19
+#define IXGBE_EMC_DIODE2_DATA           0x23
+#define IXGBE_EMC_DIODE2_THERM_LIMIT    0x1A
+#define IXGBE_EMC_DIODE3_DATA           0x2A
+#define IXGBE_EMC_DIODE3_THERM_LIMIT    0x30
+s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);
+s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);
 #define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
 #ifndef writeq
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
index 888a419dc3d9..65913c5a616e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c
@@ -278,18 +278,7 @@ s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en, u8 *prio_tc)
                IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
        } else {
-                /* X540 devices have a RX bit that should be cleared
+                hw->mac.ops.fc_enable(hw);
-                 * if PFC is disabled on all TCs but PFC features is
-                 * enabled.
-                 */
-                if (hw->mac.type == ixgbe_mac_X540) {
-                        reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-                        reg &= ~IXGBE_MFLCN_RPFCE_MASK;
-                        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
-                }
-                for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                        hw->mac.ops.fc_enable(hw, i);
        }
        return 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index 652e4b09546d..2feacf698d9b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -662,6 +662,13 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
                        return -ENOMEM;
        }
+        if (pfc->pfc_en) {
+                adapter->last_lfc_mode = adapter->hw.fc.current_mode;
+                adapter->hw.fc.current_mode = ixgbe_fc_pfc;
+        } else {
+                adapter->hw.fc.current_mode = adapter->last_lfc_mode;
+        }
        prio_tc = adapter->ixgbe_ieee_ets->prio_tc;
        memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
        return ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en, prio_tc);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index ed1b47dc0834..af1a5314b494 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -523,11 +523,17 @@ static void ixgbe_add_ring(struct ixgbe_ring *ring,
 /**
 * ixgbe_alloc_q_vector - Allocate memory for a single interrupt vector
 * @adapter: board private structure to initialize
+ * @v_count: q_vectors allocated on adapter, used for ring interleaving
 * @v_idx: index of vector in adapter struct
+ * @txr_count: total number of Tx rings to allocate
+ * @txr_idx: index of first Tx ring to allocate
+ * @rxr_count: total number of Rx rings to allocate
+ * @rxr_idx: index of first Rx ring to allocate
 *
 * We allocate one q_vector.  If allocation fails we return -ENOMEM.
 **/
-static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
+static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,
+                                int v_count, int v_idx,
                                int txr_count, int txr_idx,
                                int rxr_count, int rxr_idx)
 {
@@ -598,7 +604,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
                /* update count and index */
                txr_count--;
-                txr_idx++;
+                txr_idx += v_count;
                /* push pointer to next ring */
                ring++;
@@ -641,7 +647,7 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
                /* update count and index */
                rxr_count--;
-                rxr_idx++;
+                rxr_idx += v_count;
                /* push pointer to next ring */
                ring++;
@@ -700,24 +706,23 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
                q_vectors = 1;
        if (q_vectors >= (rxr_remaining + txr_remaining)) {
-                for (; rxr_remaining; v_idx++, q_vectors--) {
+                for (; rxr_remaining; v_idx++) {
-                        int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors);
+                        err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,
-                        err = ixgbe_alloc_q_vector(adapter, v_idx,
+                                                   0, 0, 1, rxr_idx);
-                                                   0, 0, rqpv, rxr_idx);
                        if (err)
                                goto err_out;
                        /* update counts and index */
-                        rxr_remaining -= rqpv;
+                        rxr_remaining--;
-                        rxr_idx += rqpv;
+                        rxr_idx++;
                }
        }
-        for (; q_vectors; v_idx++, q_vectors--) {
+        for (; v_idx < q_vectors; v_idx++) {
-                int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors);
+                int rqpv = DIV_ROUND_UP(rxr_remaining, q_vectors - v_idx);
-                int tqpv = DIV_ROUND_UP(txr_remaining, q_vectors);
+                int tqpv = DIV_ROUND_UP(txr_remaining, q_vectors - v_idx);
-                err = ixgbe_alloc_q_vector(adapter, v_idx,
+                err = ixgbe_alloc_q_vector(adapter, q_vectors, v_idx,
                                           tqpv, txr_idx,
                                           rqpv, rxr_idx);
@@ -726,9 +731,9 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
                /* update counts and index */
                rxr_remaining -= rqpv;
-                rxr_idx += rqpv;
                txr_remaining -= tqpv;
-                txr_idx += tqpv;
+                rxr_idx++;
+                txr_idx++;
        }
        return 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index aa29edb950f2..4048c9d35caa 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -133,7 +133,7 @@ static struct notifier_block dca_notifier = {
 static unsigned int max_vfs;
 module_param(max_vfs, uint, 0);
 MODULE_PARM_DESC(max_vfs,
-                 "Maximum number of virtual functions to allocate per physical function");
+                 "Maximum number of virtual functions to allocate per physical function - default is zero and maximum value is 63");
 #endif /* CONFIG_PCI_IOV */
 static unsigned int allow_unsupported_sfp;
@@ -637,7 +637,11 @@ static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)
                        clear_bit(__IXGBE_HANG_CHECK_ARMED,
                                  &adapter->tx_ring[i]->state);
                return;
-        } else if (!(adapter->dcb_cfg.pfc_mode_enable))
+        } else if (((adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE) &&
+                    !(adapter->dcb_cfg.pfc_mode_enable)) ||
+                   ((adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE) &&
+                    adapter->ixgbe_ieee_pfc &&
+                    !(adapter->ixgbe_ieee_pfc->pfc_en)))
                return;
        /* update stats for each tc, only valid with PFC enabled */
@@ -1144,7 +1148,7 @@ static bool ixgbe_alloc_mapped_page(struct ixgbe_ring *rx_ring,
         * there isn't much point in holding memory we can't use
         */
        if (dma_mapping_error(rx_ring->dev, dma)) {
-                put_page(page);
+                __free_pages(page, ixgbe_rx_pg_order(rx_ring));
                bi->page = NULL;
                rx_ring->rx_stats.alloc_rx_page_failed++;
@@ -4102,7 +4106,8 @@ static void ixgbe_clean_rx_ring(struct ixgbe_ring *rx_ring)
                                       DMA_FROM_DEVICE);
                rx_buffer->dma = 0;
                if (rx_buffer->page)
-                        put_page(rx_buffer->page);
+                        __free_pages(rx_buffer->page,
+                                     ixgbe_rx_pg_order(rx_ring));
                rx_buffer->page = NULL;
        }
@@ -4967,9 +4972,6 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
        if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
                u64 rsc_count = 0;
                u64 rsc_flush = 0;
-                for (i = 0; i < 16; i++)
-                        adapter->hw_rx_no_dma_resources +=
-                                IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
                for (i = 0; i < adapter->num_rx_queues; i++) {
                        rsc_count += adapter->rx_ring[i]->rx_stats.rsc_count;
                        rsc_flush += adapter->rx_ring[i]->rx_stats.rsc_flush;
@@ -5072,6 +5074,9 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
                hwstats->b2ospc += IXGBE_READ_REG(hw, IXGBE_B2OSPC);
                hwstats->b2ogprc += IXGBE_READ_REG(hw, IXGBE_B2OGPRC);
        case ixgbe_mac_82599EB:
+                for (i = 0; i < 16; i++)
+                        adapter->hw_rx_no_dma_resources +=
+                                             IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
                hwstats->gorc += IXGBE_READ_REG(hw, IXGBE_GORCL);
                IXGBE_READ_REG(hw, IXGBE_GORCH); /* to clear */
                hwstats->gotc += IXGBE_READ_REG(hw, IXGBE_GOTCL);
@@ -5249,7 +5254,7 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
        struct ixgbe_hw *hw = &adapter->hw;
        u32 link_speed = adapter->link_speed;
        bool link_up = adapter->link_up;
-        int i;
+        bool pfc_en = adapter->dcb_cfg.pfc_mode_enable;
        if (!(adapter->flags & IXGBE_FLAG_NEED_LINK_UPDATE))
                return;
@@ -5261,14 +5266,12 @@ static void ixgbe_watchdog_update_link(struct ixgbe_adapter *adapter)
                link_speed = IXGBE_LINK_SPEED_10GB_FULL;
                link_up = true;
        }
-        if (link_up) {
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+        if (adapter->ixgbe_ieee_pfc)
-                        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                pfc_en |= !!(adapter->ixgbe_ieee_pfc->pfc_en);
-                                hw->mac.ops.fc_enable(hw, i);
-                } else {
+        if (link_up && !((adapter->flags & IXGBE_FLAG_DCB_ENABLED) && pfc_en))
-                        hw->mac.ops.fc_enable(hw, 0);
+                hw->mac.ops.fc_enable(hw);
-                }
-        }
        if (link_up ||
            time_after(jiffies, (adapter->link_check_timeout +
@@ -6778,9 +6781,10 @@ static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
        /* The 82599 supports up to 64 VFs per physical function
         * but this implementation limits allocation to 63 so that
         * basic networking resources are still available to the
-         * physical function
+         * physical function.  If the user requests greater thn
+         * 63 VFs then it is an error - reset to default of zero.
         */
-        adapter->num_vfs = (max_vfs > 63) ? 63 : max_vfs;
+        adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
        ixgbe_enable_sriov(adapter, ii);
 #endif /* CONFIG_PCI_IOV */
 }
@@ -7219,6 +7223,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
        e_dev_info("%s\n", ixgbe_default_device_descr);
        cards_found++;
+        if (ixgbe_sysfs_init(adapter))
+                e_err(probe, "failed to allocate sysfs resources\n");
        return 0;
 err_register:
@@ -7265,6 +7273,8 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)
        }
 #endif
+        ixgbe_sysfs_exit(adapter);
 #ifdef IXGBE_FCOE
        if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
                ixgbe_cleanup_fcoe(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 88a58cb08569..39856371acb1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -635,6 +635,12 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
                }
                break;
        case IXGBE_VF_SET_MACVLAN:
+                if (adapter->vfinfo[vf].pf_set_mac) {
+                        e_warn(drv, "VF %d requested MACVLAN filter but is "
+                                    "administratively denied\n", vf);
+                        retval = -1;
+                        break;
+                }
                index = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK) >>
                        IXGBE_VT_MSGINFO_SHIFT;
                /*
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
new file mode 100644
index 000000000000..f81c166dc5a8
--- /dev/null
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
@@ -0,0 +1,273 @@
+/*******************************************************************************
+  Intel 10 Gigabit PCI Express Linux driver
+  Copyright(c) 1999 - 2012 Intel Corporation.
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+  Contact Information:
+  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+*******************************************************************************/
+#include "ixgbe.h"
+#include "ixgbe_common.h"
+#include "ixgbe_type.h"
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/sysfs.h>
+#include <linux/kobject.h>
+#include <linux/device.h>
+#include <linux/netdevice.h>
+#include <linux/hwmon.h>
+/*
+ * This file provides a sysfs interface to export information from the
+ * driver.  The information presented is READ-ONLY.
+ */
+#ifdef CONFIG_IXGBE_HWMON
+/* hwmon callback functions */
+static ssize_t ixgbe_hwmon_show_location(struct device *dev,
+                                         struct device_attribute *attr,
+                                         char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        return sprintf(buf, "loc%u\n",
+                       ixgbe_attr->sensor->location);
+}
+static ssize_t ixgbe_hwmon_show_temp(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value;
+        /* reset the temp field */
+        ixgbe_attr->hw->mac.ops.get_thermal_sensor_data(ixgbe_attr->hw);
+        value = ixgbe_attr->sensor->temp;
+        /* display millidegree */
+        value *= 1000;
+        return sprintf(buf, "%u\n", value);
+}
+static ssize_t ixgbe_hwmon_show_cautionthresh(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value = ixgbe_attr->sensor->caution_thresh;
+        /* display millidegree */
+        value *= 1000;
+        return sprintf(buf, "%u\n", value);
+}
+static ssize_t ixgbe_hwmon_show_maxopthresh(struct device *dev,
+                                     struct device_attribute *attr,
+                                     char *buf)
+{
+        struct hwmon_attr *ixgbe_attr = container_of(attr, struct hwmon_attr,
+                                                     dev_attr);
+        unsigned int value = ixgbe_attr->sensor->max_op_thresh;
+        /* display millidegree */
+        value *= 1000;
+        return sprintf(buf, "%u\n", value);
+}
+/*
+ * ixgbe_add_hwmon_attr - Create hwmon attr table for a hwmon sysfs file.
+ * @ adapter: pointer to the adapter structure
+ * @ offset: offset in the eeprom sensor data table
+ * @ type: type of sensor data to display
+ *
+ * For each file we want in hwmon's sysfs interface we need a device_attribute
+ * This is included in our hwmon_attr struct that contains the references to
+ * the data structures we need to get the data to display.
+ */
+static int ixgbe_add_hwmon_attr(struct ixgbe_adapter *adapter,
+                                unsigned int offset, int type) {
+        int rc;
+        unsigned int n_attr;
+        struct hwmon_attr *ixgbe_attr;
+        n_attr = adapter->ixgbe_hwmon_buff.n_hwmon;
+        ixgbe_attr = &adapter->ixgbe_hwmon_buff.hwmon_list[n_attr];
+        switch (type) {
+        case IXGBE_HWMON_TYPE_LOC:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_location;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_label", offset);
+                break;
+        case IXGBE_HWMON_TYPE_TEMP:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_temp;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_input", offset);
+                break;
+        case IXGBE_HWMON_TYPE_CAUTION:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_cautionthresh;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_max", offset);
+                break;
+        case IXGBE_HWMON_TYPE_MAX:
+                ixgbe_attr->dev_attr.show = ixgbe_hwmon_show_maxopthresh;
+                snprintf(ixgbe_attr->name, sizeof(ixgbe_attr->name),
+                         "temp%u_crit", offset);
+                break;
+        default:
+                rc = -EPERM;
+                return rc;
+        }
+        /* These always the same regardless of type */
+        ixgbe_attr->sensor =
+                &adapter->hw.mac.thermal_sensor_data.sensor[offset];
+        ixgbe_attr->hw = &adapter->hw;
+        ixgbe_attr->dev_attr.store = NULL;
+        ixgbe_attr->dev_attr.attr.mode = S_IRUGO;
+        ixgbe_attr->dev_attr.attr.name = ixgbe_attr->name;
+        rc = device_create_file(&adapter->pdev->dev,
+                                &ixgbe_attr->dev_attr);
+        if (rc == 0)
+                ++adapter->ixgbe_hwmon_buff.n_hwmon;
+        return rc;
+}
+#endif /* CONFIG_IXGBE_HWMON */
+static void ixgbe_sysfs_del_adapter(struct ixgbe_adapter *adapter)
+{
+#ifdef CONFIG_IXGBE_HWMON
+        int i;
+#endif /* CONFIG_IXGBE_HWMON */
+        if (adapter == NULL)
+                return;
+#ifdef CONFIG_IXGBE_HWMON
+        for (i = 0; i < adapter->ixgbe_hwmon_buff.n_hwmon; i++) {
+                device_remove_file(&adapter->pdev->dev,
+                           &adapter->ixgbe_hwmon_buff.hwmon_list[i].dev_attr);
+        }
+        kfree(adapter->ixgbe_hwmon_buff.hwmon_list);
+        if (adapter->ixgbe_hwmon_buff.device)
+                hwmon_device_unregister(adapter->ixgbe_hwmon_buff.device);
+#endif /* CONFIG_IXGBE_HWMON */
+        if (adapter->info_kobj != NULL) {
+                kobject_put(adapter->info_kobj);
+                adapter->info_kobj = NULL;
+        }
+}
+/* called from ixgbe_main.c */
+void ixgbe_sysfs_exit(struct ixgbe_adapter *adapter)
+{
+        ixgbe_sysfs_del_adapter(adapter);
+}
+/* called from ixgbe_main.c */
+int ixgbe_sysfs_init(struct ixgbe_adapter *adapter)
+{
+#ifdef CONFIG_IXGBE_HWMON
+        struct hwmon_buff *ixgbe_hwmon = &adapter->ixgbe_hwmon_buff;
+        unsigned int i;
+        int n_attrs;
+#endif /* CONFIG_IXGBE_HWMON */
+        struct net_device *netdev = adapter->netdev;
+        int rc = 0;
+        /* create info kobj and attribute listings in kobj */
+        adapter->info_kobj = kobject_create_and_add("info", &netdev->dev.kobj);
+        if (adapter->info_kobj == NULL) {
+                rc = -ENOMEM;
+                goto err;
+        }
+#ifdef CONFIG_IXGBE_HWMON
+        /* If this method isn't defined we don't support thermals */
+        if (adapter->hw.mac.ops.init_thermal_sensor_thresh == NULL) {
+                rc = -EPERM;
+                goto err;
+        }
+        /* Don't create thermal hwmon interface if no sensors present */
+        rc = adapter->hw.mac.ops.init_thermal_sensor_thresh(&adapter->hw);
+        if (rc)
+                goto err;
+        /*
+         * Allocation space for max attributs
+         * max num sensors * values (loc, temp, max, caution)
+         */
+        n_attrs = IXGBE_MAX_SENSORS * 4;
+        ixgbe_hwmon->hwmon_list = kcalloc(n_attrs, sizeof(struct hwmon_attr),
+                                          GFP_KERNEL);
+        if (!ixgbe_hwmon->hwmon_list) {
+                rc = -ENOMEM;
+                goto err;
+        }
+        ixgbe_hwmon->device = hwmon_device_register(&adapter->pdev->dev);
+        if (IS_ERR(ixgbe_hwmon->device)) {
+                rc = PTR_ERR(ixgbe_hwmon->device);
+                goto err;
+        }
+        for (i = 0; i < IXGBE_MAX_SENSORS; i++) {
+                /*
+                 * Only create hwmon sysfs entries for sensors that have
+                 * meaningful data for.
+                 */
+                if (adapter->hw.mac.thermal_sensor_data.sensor[i].location == 0)
+                        continue;
+                /* Bail if any hwmon attr struct fails to initialize */
+                rc = ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_CAUTION);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_LOC);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_TEMP);
+                rc |= ixgbe_add_hwmon_attr(adapter, i, IXGBE_HWMON_TYPE_MAX);
+                if (rc)
+                        goto err;
+        }
+#endif /* CONFIG_IXGBE_HWMON */
+        goto exit;
+err:
+        ixgbe_sysfs_del_adapter(adapter);
+exit:
+        return rc;
+}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 4acd9e665b28..5e64c77255e9 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -112,6 +112,27 @@
 #define IXGBE_I2C_DATA_OUT  0x00000008
 #define IXGBE_I2C_CLOCK_STRETCHING_TIMEOUT      500
+#define IXGBE_I2C_THERMAL_SENSOR_ADDR   0xF8
+#define IXGBE_EMC_INTERNAL_DATA         0x00
+#define IXGBE_EMC_INTERNAL_THERM_LIMIT  0x20
+#define IXGBE_EMC_DIODE1_DATA           0x01
+#define IXGBE_EMC_DIODE1_THERM_LIMIT    0x19
+#define IXGBE_EMC_DIODE2_DATA           0x23
+#define IXGBE_EMC_DIODE2_THERM_LIMIT    0x1A
+#define IXGBE_MAX_SENSORS               3
+struct ixgbe_thermal_diode_data {
+        u8 location;
+        u8 temp;
+        u8 caution_thresh;
+        u8 max_op_thresh;
+};
+struct ixgbe_thermal_sensor_data {
+        struct ixgbe_thermal_diode_data sensor[IXGBE_MAX_SENSORS];
+};
 /* Interrupt Registers */
 #define IXGBE_EICR      0x00800
 #define IXGBE_EICS      0x00808
@@ -1678,6 +1699,22 @@ enum {
 #define IXGBE_PBANUM0_PTR       0x15
 #define IXGBE_PBANUM1_PTR       0x16
 #define IXGBE_FREE_SPACE_PTR    0X3E
+/* External Thermal Sensor Config */
+#define IXGBE_ETS_CFG                   0x26
+#define IXGBE_ETS_LTHRES_DELTA_MASK     0x07C0
+#define IXGBE_ETS_LTHRES_DELTA_SHIFT    6
+#define IXGBE_ETS_TYPE_MASK             0x0038
+#define IXGBE_ETS_TYPE_SHIFT            3
+#define IXGBE_ETS_TYPE_EMC              0x000
+#define IXGBE_ETS_TYPE_EMC_SHIFTED      0x000
+#define IXGBE_ETS_NUM_SENSORS_MASK      0x0007
+#define IXGBE_ETS_DATA_LOC_MASK         0x3C00
+#define IXGBE_ETS_DATA_LOC_SHIFT        10
+#define IXGBE_ETS_DATA_INDEX_MASK       0x0300
+#define IXGBE_ETS_DATA_INDEX_SHIFT      8
+#define IXGBE_ETS_DATA_HTHRESH_MASK     0x00FF
 #define IXGBE_SAN_MAC_ADDR_PTR  0x28
 #define IXGBE_DEVICE_CAPS       0x2C
 #define IXGBE_SERIAL_NUMBER_MAC_ADDR 0x11
@@ -1855,7 +1892,7 @@ enum {
 #define IXGBE_MFLCN_DPF         0x00000002 /* Discard Pause Frame */
 #define IXGBE_MFLCN_RPFCE       0x00000004 /* Receive Priority FC Enable */
 #define IXGBE_MFLCN_RFCE        0x00000008 /* Receive FC Enable */
-#define IXGBE_MFLCN_RPFCE_MASK  0x00000FF0 /* Receive FC Mask */
+#define IXGBE_MFLCN_RPFCE_MASK  0x00000FF4 /* Receive FC Mask */
 #define IXGBE_MFLCN_RPFCE_SHIFT          4
@@ -2771,10 +2808,12 @@ struct ixgbe_mac_operations {
        void (*set_vlan_anti_spoofing)(struct ixgbe_hw *, bool, int);
        /* Flow Control */
-        s32 (*fc_enable)(struct ixgbe_hw *, s32);
+        s32 (*fc_enable)(struct ixgbe_hw *);
        /* Manageability interface */
        s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
+        s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
+        s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
 };
 struct ixgbe_phy_operations {
@@ -2832,6 +2871,7 @@ struct ixgbe_mac_info {
        bool                            orig_link_settings_stored;
        bool                            autotry_restart;
        u8                              flags;
+        struct ixgbe_thermal_sensor_data  thermal_sensor_data;
 };
 struct ixgbe_phy_info {
@@ -2941,7 +2981,6 @@ struct ixgbe_info {
 #define IXGBE_ERR_OVERTEMP                      -26
 #define IXGBE_ERR_FC_NOT_NEGOTIATED             -27
 #define IXGBE_ERR_FC_NOT_SUPPORTED              -28
-#define IXGBE_ERR_FLOW_CONTROL                  -29
 #define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30
 #define IXGBE_ERR_PBA_SECTION                   -31
 #define IXGBE_ERR_INVALID_ARGUMENT              -32
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 97a991403bbd..f90ec078ece2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -849,6 +849,8 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
        .release_swfw_sync      = &ixgbe_release_swfw_sync_X540,
        .disable_rx_buff        = &ixgbe_disable_rx_buff_generic,
        .enable_rx_buff         = &ixgbe_enable_rx_buff_generic,
+        .get_thermal_sensor_data = NULL,
+        .init_thermal_sensor_thresh = NULL,
 };
 static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
diff --git a/drivers/net/ethernet/intel/ixgbevf/defines.h b/drivers/net/ethernet/intel/ixgbevf/defines.h
index 947b5c830735..e09a6cc633bb 100644
--- a/drivers/net/ethernet/intel/ixgbevf/defines.h
+++ b/drivers/net/ethernet/intel/ixgbevf/defines.h
@@ -40,6 +40,7 @@
 typedef u32 ixgbe_link_speed;
 #define IXGBE_LINK_SPEED_1GB_FULL       0x0020
 #define IXGBE_LINK_SPEED_10GB_FULL      0x0080
+#define IXGBE_LINK_SPEED_100_FULL       0x0008
 #define IXGBE_CTRL_RST              0x04000000 /* Reset (SW) */
 #define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */
@@ -48,6 +49,7 @@ typedef u32 ixgbe_link_speed;
 #define IXGBE_LINKS_SPEED_82599     0x30000000
 #define IXGBE_LINKS_SPEED_10G_82599 0x30000000
 #define IXGBE_LINKS_SPEED_1G_82599  0x20000000
+#define IXGBE_LINKS_SPEED_100_82599 0x10000000
 /* Number of Transmit and Receive Descriptors must be a multiple of 8 */
 #define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index 2bfe0d1d7958..e8dddf572d38 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -107,10 +107,20 @@ static int ixgbevf_get_settings(struct net_device *netdev,
        hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
        if (link_up) {
-                ethtool_cmd_speed_set(
+                __u32 speed = SPEED_10000;
-                        ecmd,
+                switch (link_speed) {
-                        (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
+                case IXGBE_LINK_SPEED_10GB_FULL:
-                        SPEED_10000 : SPEED_1000);
+                        speed = SPEED_10000;
+                        break;
+                case IXGBE_LINK_SPEED_1GB_FULL:
+                        speed = SPEED_1000;
+                        break;
+                case IXGBE_LINK_SPEED_100_FULL:
+                        speed = SPEED_100;
+                        break;
+                }
+                ethtool_cmd_speed_set(ecmd, speed);
                ecmd->duplex = DUPLEX_FULL;
        } else {
                ethtool_cmd_speed_set(ecmd, -1);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index dfed420a1bf6..0a1b99240d43 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -287,7 +287,7 @@ extern const struct ixgbe_mbx_operations ixgbevf_mbx_ops;
 extern const char ixgbevf_driver_name[];
 extern const char ixgbevf_driver_version[];
-extern int ixgbevf_up(struct ixgbevf_adapter *adapter);
+extern void ixgbevf_up(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_down(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_reinit_locked(struct ixgbevf_adapter *adapter);
 extern void ixgbevf_reset(struct ixgbevf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 307611ae831d..f69ec4288b10 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -57,7 +57,7 @@ const char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
        "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
-#define DRV_VERSION "2.2.0-k"
+#define DRV_VERSION "2.6.0-k"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
        "Copyright (c) 2009 - 2012 Intel Corporation.";
@@ -1608,13 +1608,14 @@ static void ixgbevf_init_last_counter_stats(struct ixgbevf_adapter *adapter)
        adapter->stats.base_vfmprc = adapter->stats.last_vfmprc;
 }
-static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
+static void ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
        struct ixgbe_hw *hw = &adapter->hw;
        int i, j = 0;
        int num_rx_rings = adapter->num_rx_queues;
        u32 txdctl, rxdctl;
+        u32 msg[2];
        for (i = 0; i < adapter->num_tx_queues; i++) {
                j = adapter->tx_ring[i].reg_idx;
@@ -1653,6 +1654,10 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
                        hw->mac.ops.set_rar(hw, 0, hw->mac.perm_addr, 0);
        }
+        msg[0] = IXGBE_VF_SET_LPE;
+        msg[1] = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        hw->mbx.ops.write_posted(hw, msg, 2);
        clear_bit(__IXGBEVF_DOWN, &adapter->state);
        ixgbevf_napi_enable_all(adapter);
@@ -1667,24 +1672,20 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
        adapter->flags |= IXGBE_FLAG_NEED_LINK_UPDATE;
        adapter->link_check_timeout = jiffies;
        mod_timer(&adapter->watchdog_timer, jiffies);
-        return 0;
 }
-int ixgbevf_up(struct ixgbevf_adapter *adapter)
+void ixgbevf_up(struct ixgbevf_adapter *adapter)
 {
-        int err;
        struct ixgbe_hw *hw = &adapter->hw;
        ixgbevf_configure(adapter);
-        err = ixgbevf_up_complete(adapter);
+        ixgbevf_up_complete(adapter);
        /* clear any pending interrupts, may auto mask */
        IXGBE_READ_REG(hw, IXGBE_VTEICR);
        ixgbevf_irq_enable(adapter, true, true);
-        return err;
 }
 /**
@@ -2673,9 +2674,7 @@ static int ixgbevf_open(struct net_device *netdev)
         */
        ixgbevf_map_rings_to_vectors(adapter);
-        err = ixgbevf_up_complete(adapter);
+        ixgbevf_up_complete(adapter);
-        if (err)
-                goto err_up;
        /* clear any pending interrupts, may auto mask */
        IXGBE_READ_REG(hw, IXGBE_VTEICR);
@@ -2689,7 +2688,6 @@ static int ixgbevf_open(struct net_device *netdev)
 err_req_irq:
        ixgbevf_down(adapter);
-err_up:
        ixgbevf_free_irq(adapter);
 err_setup_rx:
        ixgbevf_free_all_rx_resources(adapter);
@@ -3196,9 +3194,11 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
        /* must set new MTU before calling down or up */
        netdev->mtu = new_mtu;
-        msg[0] = IXGBE_VF_SET_LPE;
+        if (!netif_running(netdev)) {
-        msg[1] = max_frame;
+                msg[0] = IXGBE_VF_SET_LPE;
-        hw->mbx.ops.write_posted(hw, msg, 2);
+                msg[1] = max_frame;
+                hw->mbx.ops.write_posted(hw, msg, 2);
+        }
        if (netif_running(netdev))
                ixgbevf_reinit_locked(adapter);
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c
index 74be7411242a..ec89b86f7ca4 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.c
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.c
@@ -404,11 +404,17 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw,
        else
                *link_up = false;
-        if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+        switch (links_reg & IXGBE_LINKS_SPEED_82599) {
-            IXGBE_LINKS_SPEED_10G_82599)
+        case IXGBE_LINKS_SPEED_10G_82599:
                *speed = IXGBE_LINK_SPEED_10GB_FULL;
-        else
+                break;
+        case IXGBE_LINKS_SPEED_1G_82599:
                *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                break;
+        case IXGBE_LINKS_SPEED_100_82599:
+                *speed = IXGBE_LINK_SPEED_100_FULL;
+                break;
+        }
        return 0;
 }
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index ddc95b0ac78d..e559dfa06d6a 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -623,7 +623,7 @@ static void pasemi_mac_free_rx_resources(struct pasemi_mac *mac)
        mac->rx = NULL;
 }
-static void pasemi_mac_replenish_rx_ring(const struct net_device *dev,
+static void pasemi_mac_replenish_rx_ring(struct net_device *dev,
                                         const int limit)
 {
        const struct pasemi_mac *mac = netdev_priv(dev);
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index c99b3b0e2eae..703c8cce2a2c 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9838,7 +9838,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
                        goto err_out_release_parent;
                }
        }
-        if (err || dma_mask == DMA_BIT_MASK(32)) {
+        if (err) {
                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                if (err) {
                        dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 0e01f4e5cd64..944cdfb80fe4 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -135,6 +135,25 @@ config MDIO_OCTEON
          If in doubt, say Y.
+config MDIO_BUS_MUX
+        tristate
+        depends on OF_MDIO
+        help
+          This module provides a driver framework for MDIO bus
+          multiplexers which connect one of several child MDIO busses
+          to a parent bus.  Switching between child busses is done by
+          device specific drivers.
+config MDIO_BUS_MUX_GPIO
+        tristate "Support for GPIO controlled MDIO bus multiplexers"
+        depends on OF_GPIO && OF_MDIO
+        select MDIO_BUS_MUX
+        help
+          This module provides a driver for MDIO bus multiplexers that
+          are controlled via GPIO lines.  The multiplexer connects one of
+          several child MDIO busses to a parent bus.  Child bus
+          selection is under the control of GPIO lines.
 endif # PHYLIB
 config MICREL_KS8995MA
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index b7438b1b94b9..f51af688ef8b 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_MICREL_PHY)	+= micrel.o
 obj-$(CONFIG_MDIO_OCTEON)       += mdio-octeon.o
 obj-$(CONFIG_MICREL_KS8995MA)   += spi_ks8995.o
 obj-$(CONFIG_AMD_PHY)           += amd.o
+obj-$(CONFIG_MDIO_BUS_MUX)      += mdio-mux.o
+obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o
diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
new file mode 100644
index 000000000000..e0cc4ef33dee
--- /dev/null
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -0,0 +1,142 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/of_mdio.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/phy.h>
+#include <linux/mdio-mux.h>
+#include <linux/of_gpio.h>
+#define DRV_VERSION "1.0"
+#define DRV_DESCRIPTION "GPIO controlled MDIO bus multiplexer driver"
+#define MDIO_MUX_GPIO_MAX_BITS 8
+struct mdio_mux_gpio_state {
+        int gpio[MDIO_MUX_GPIO_MAX_BITS];
+        unsigned int num_gpios;
+        void *mux_handle;
+};
+static int mdio_mux_gpio_switch_fn(int current_child, int desired_child,
+                                   void *data)
+{
+        int change;
+        unsigned int n;
+        struct mdio_mux_gpio_state *s = data;
+        if (current_child == desired_child)
+                return 0;
+        change = current_child == -1 ? -1 : current_child ^ desired_child;
+        for (n = 0; n < s->num_gpios; n++) {
+                if (change & 1)
+                        gpio_set_value_cansleep(s->gpio[n],
+                                                (desired_child & 1) != 0);
+                change >>= 1;
+                desired_child >>= 1;
+        }
+        return 0;
+}
+static int __devinit mdio_mux_gpio_probe(struct platform_device *pdev)
+{
+        enum of_gpio_flags f;
+        struct mdio_mux_gpio_state *s;
+        unsigned int num_gpios;
+        unsigned int n;
+        int r;
+        if (!pdev->dev.of_node)
+                return -ENODEV;
+        num_gpios = of_gpio_count(pdev->dev.of_node);
+        if (num_gpios == 0 || num_gpios > MDIO_MUX_GPIO_MAX_BITS)
+                return -ENODEV;
+        s = devm_kzalloc(&pdev->dev, sizeof(*s), GFP_KERNEL);
+        if (!s)
+                return -ENOMEM;
+        s->num_gpios = num_gpios;
+        for (n = 0; n < num_gpios; ) {
+                int gpio = of_get_gpio_flags(pdev->dev.of_node, n, &f);
+                if (gpio < 0) {
+                        r = (gpio == -ENODEV) ? -EPROBE_DEFER : gpio;
+                        goto err;
+                }
+                s->gpio[n] = gpio;
+                n++;
+                r = gpio_request(gpio, "mdio_mux_gpio");
+                if (r)
+                        goto err;
+                r = gpio_direction_output(gpio, 0);
+                if (r)
+                        goto err;
+        }
+        r = mdio_mux_init(&pdev->dev,
+                          mdio_mux_gpio_switch_fn, &s->mux_handle, s);
+        if (r == 0) {
+                pdev->dev.platform_data = s;
+                return 0;
+        }
+err:
+        while (n) {
+                n--;
+                gpio_free(s->gpio[n]);
+        }
+        devm_kfree(&pdev->dev, s);
+        return r;
+}
+static int __devexit mdio_mux_gpio_remove(struct platform_device *pdev)
+{
+        struct mdio_mux_gpio_state *s = pdev->dev.platform_data;
+        mdio_mux_uninit(s->mux_handle);
+        return 0;
+}
+static struct of_device_id mdio_mux_gpio_match[] = {
+        {
+                .compatible = "mdio-mux-gpio",
+        },
+        {
+                /* Legacy compatible property. */
+                .compatible = "cavium,mdio-mux-sn74cbtlv3253",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, mdio_mux_gpio_match);
+static struct platform_driver mdio_mux_gpio_driver = {
+        .driver = {
+                .name           = "mdio-mux-gpio",
+                .owner          = THIS_MODULE,
+                .of_match_table = mdio_mux_gpio_match,
+        },
+        .probe          = mdio_mux_gpio_probe,
+        .remove         = __devexit_p(mdio_mux_gpio_remove),
+};
+module_platform_driver(mdio_mux_gpio_driver);
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
new file mode 100644
index 000000000000..39ea0674dcde
--- /dev/null
+++ b/drivers/net/phy/mdio-mux.c
@@ -0,0 +1,192 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+#include <linux/platform_device.h>
+#include <linux/mdio-mux.h>
+#include <linux/of_mdio.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/phy.h>
+#define DRV_VERSION "1.0"
+#define DRV_DESCRIPTION "MDIO bus multiplexer driver"
+struct mdio_mux_child_bus;
+struct mdio_mux_parent_bus {
+        struct mii_bus *mii_bus;
+        int current_child;
+        int parent_id;
+        void *switch_data;
+        int (*switch_fn)(int current_child, int desired_child, void *data);
+        /* List of our children linked through their next fields. */
+        struct mdio_mux_child_bus *children;
+};
+struct mdio_mux_child_bus {
+        struct mii_bus *mii_bus;
+        struct mdio_mux_parent_bus *parent;
+        struct mdio_mux_child_bus *next;
+        int bus_number;
+        int phy_irq[PHY_MAX_ADDR];
+};
+/*
+ * The parent bus' lock is used to order access to the switch_fn.
+ */
+static int mdio_mux_read(struct mii_bus *bus, int phy_id, int regnum)
+{
+        struct mdio_mux_child_bus *cb = bus->priv;
+        struct mdio_mux_parent_bus *pb = cb->parent;
+        int r;
+        mutex_lock(&pb->mii_bus->mdio_lock);
+        r = pb->switch_fn(pb->current_child, cb->bus_number, pb->switch_data);
+        if (r)
+                goto out;
+        pb->current_child = cb->bus_number;
+        r = pb->mii_bus->read(pb->mii_bus, phy_id, regnum);
+out:
+        mutex_unlock(&pb->mii_bus->mdio_lock);
+        return r;
+}
+/*
+ * The parent bus' lock is used to order access to the switch_fn.
+ */
+static int mdio_mux_write(struct mii_bus *bus, int phy_id,
+                          int regnum, u16 val)
+{
+        struct mdio_mux_child_bus *cb = bus->priv;
+        struct mdio_mux_parent_bus *pb = cb->parent;
+        int r;
+        mutex_lock(&pb->mii_bus->mdio_lock);
+        r = pb->switch_fn(pb->current_child, cb->bus_number, pb->switch_data);
+        if (r)
+                goto out;
+        pb->current_child = cb->bus_number;
+        r = pb->mii_bus->write(pb->mii_bus, phy_id, regnum, val);
+out:
+        mutex_unlock(&pb->mii_bus->mdio_lock);
+        return r;
+}
+static int parent_count;
+int mdio_mux_init(struct device *dev,
+                  int (*switch_fn)(int cur, int desired, void *data),
+                  void **mux_handle,
+                  void *data)
+{
+        struct device_node *parent_bus_node;
+        struct device_node *child_bus_node;
+        int r, ret_val;
+        struct mii_bus *parent_bus;
+        struct mdio_mux_parent_bus *pb;
+        struct mdio_mux_child_bus *cb;
+        if (!dev->of_node)
+                return -ENODEV;
+        parent_bus_node = of_parse_phandle(dev->of_node, "mdio-parent-bus", 0);
+        if (!parent_bus_node)
+                return -ENODEV;
+        parent_bus = of_mdio_find_bus(parent_bus_node);
+        if (parent_bus == NULL) {
+                ret_val = -EPROBE_DEFER;
+                goto err_parent_bus;
+        }
+        pb = devm_kzalloc(dev, sizeof(*pb), GFP_KERNEL);
+        if (pb == NULL) {
+                ret_val = -ENOMEM;
+                goto err_parent_bus;
+        }
+        pb->switch_data = data;
+        pb->switch_fn = switch_fn;
+        pb->current_child = -1;
+        pb->parent_id = parent_count++;
+        pb->mii_bus = parent_bus;
+        ret_val = -ENODEV;
+        for_each_child_of_node(dev->of_node, child_bus_node) {
+                u32 v;
+                r = of_property_read_u32(child_bus_node, "reg", &v);
+                if (r)
+                        continue;
+                cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL);
+                if (cb == NULL) {
+                        dev_err(dev,
+                                "Error: Failed to allocate memory for child\n");
+                        ret_val = -ENOMEM;
+                        break;
+                }
+                cb->bus_number = v;
+                cb->parent = pb;
+                cb->mii_bus = mdiobus_alloc();
+                cb->mii_bus->priv = cb;
+                cb->mii_bus->irq = cb->phy_irq;
+                cb->mii_bus->name = "mdio_mux";
+                snprintf(cb->mii_bus->id, MII_BUS_ID_SIZE, "%x.%x",
+                         pb->parent_id, v);
+                cb->mii_bus->parent = dev;
+                cb->mii_bus->read = mdio_mux_read;
+                cb->mii_bus->write = mdio_mux_write;
+                r = of_mdiobus_register(cb->mii_bus, child_bus_node);
+                if (r) {
+                        mdiobus_free(cb->mii_bus);
+                        devm_kfree(dev, cb);
+                } else {
+                        of_node_get(child_bus_node);
+                        cb->next = pb->children;
+                        pb->children = cb;
+                }
+        }
+        if (pb->children) {
+                *mux_handle = pb;
+                dev_info(dev, "Version " DRV_VERSION "\n");
+                return 0;
+        }
+err_parent_bus:
+        of_node_put(parent_bus_node);
+        return ret_val;
+}
+EXPORT_SYMBOL_GPL(mdio_mux_init);
+void mdio_mux_uninit(void *mux_handle)
+{
+        struct mdio_mux_parent_bus *pb = mux_handle;
+        struct mdio_mux_child_bus *cb = pb->children;
+        while (cb) {
+                mdiobus_unregister(cb->mii_bus);
+                mdiobus_free(cb->mii_bus);
+                cb = cb->next;
+        }
+}
+EXPORT_SYMBOL_GPL(mdio_mux_uninit);
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR("David Daney");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 8985cc62cf41..83d5c9f55686 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -88,6 +88,38 @@ static struct class mdio_bus_class = {
        .dev_release    = mdiobus_release,
 };
+#ifdef CONFIG_OF_MDIO
+/* Helper function for of_mdio_find_bus */
+static int of_mdio_bus_match(struct device *dev, void *mdio_bus_np)
+{
+        return dev->of_node == mdio_bus_np;
+}
+/**
+ * of_mdio_find_bus - Given an mii_bus node, find the mii_bus.
+ * @mdio_np: Pointer to the mii_bus.
+ *
+ * Returns a pointer to the mii_bus, or NULL if none found.
+ *
+ * Because the association of a device_node and mii_bus is made via
+ * of_mdiobus_register(), the mii_bus cannot be found before it is
+ * registered with of_mdiobus_register().
+ *
+ */
+struct mii_bus *of_mdio_find_bus(struct device_node *mdio_bus_np)
+{
+        struct device *d;
+        if (!mdio_bus_np)
+                return NULL;
+        d = class_find_device(&mdio_bus_class, NULL,  mdio_bus_np,
+                              of_mdio_bus_match);
+        return d ? to_mii_bus(d) : NULL;
+}
+EXPORT_SYMBOL(of_mdio_find_bus);
+#endif
 /**
 * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
 * @bus: target mii_bus
diff --git a/drivers/net/wimax/i2400m/usb-rx.c b/drivers/net/wimax/i2400m/usb-rx.c
index e3257681e360..b78ee676e102 100644
--- a/drivers/net/wimax/i2400m/usb-rx.c
+++ b/drivers/net/wimax/i2400m/usb-rx.c
@@ -277,7 +277,7 @@ retry:
                d_printf(1, dev, "RX: size changed to %d, received %d, "
                         "copied %d, capacity %ld\n",
                         rx_size, read_size, rx_skb->len,
-                         (long) (skb_end_pointer(new_skb) - new_skb->head));
+                         (long) skb_end_offset(new_skb));
                goto retry;
        }
                /* In most cases, it happens due to the hardware scheduling a
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 483c0adcad87..2574abde8d99 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -45,6 +45,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                for (i=0; i<PHY_MAX_ADDR; i++)
                        mdio->irq[i] = PHY_POLL;
+        mdio->dev.of_node = np;
        /* Register the MDIO bus */
        rc = mdiobus_register(mdio);
        if (rc)
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 56d74dc2fbd5..418ed03d0887 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -344,7 +344,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
        }
        if (unlikely
            (skb->truesize !=
-             sizeof(*skb) + skb_end_pointer(skb) - skb->head)) {
+             sizeof(*skb) + skb_end_offset(skb))) {
                /*
                   printk("TX buffer truesize has been changed\n");
                 */
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 4af841408fb5..de165b54237b 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -135,6 +135,9 @@ extern int	create_l1(struct dchannel *, dchannel_l1callback *);
 #define HW_TESTRX_RAW   0x9602
 #define HW_TESTRX_HDLC  0x9702
 #define HW_TESTRX_OFF   0x9802
+#define HW_TIMER3_IND   0x9902
+#define HW_TIMER3_VALUE 0x9a00
+#define HW_TIMER3_VMASK 0x00FF
 struct layer1;
 extern int      l1_event(struct layer1 *, u_int);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index b5e7f2202484..ce6e613dff4c 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -37,7 +37,7 @@
 */
 #define MISDN_MAJOR_VERSION     1
 #define MISDN_MINOR_VERSION     1
-#define MISDN_RELEASE           21
+#define MISDN_RELEASE           28
 /* primitives for information exchange
 * generell format
@@ -115,6 +115,11 @@
 #define MDL_ERROR_IND           0x1F04
 #define MDL_ERROR_RSP           0x5F04
+/* intern layer 2 */
+#define DL_TIMER200_IND         0x7004
+#define DL_TIMER203_IND         0x7304
+#define DL_INTERN_MSG           0x7804
 /* DL_INFORMATION_IND types */
 #define DL_INFO_L2_CONNECT      0x0001
 #define DL_INFO_L2_REMOVED      0x0002
@@ -367,6 +372,7 @@ clear_channelmap(u_int nr, u_char *map)
 #define MISDN_CTRL_RX_OFF               0x0100
 #define MISDN_CTRL_FILL_EMPTY           0x0200
 #define MISDN_CTRL_GETPEER              0x0400
+#define MISDN_CTRL_L1_TIMER3            0x0800
 #define MISDN_CTRL_HW_FEATURES_OP       0x2000
 #define MISDN_CTRL_HW_FEATURES          0x2001
 #define MISDN_CTRL_HFC_OP               0x4000
@@ -585,6 +591,7 @@ static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
 extern void     set_channel_address(struct mISDNchannel *, u_int, u_int);
 extern void     mISDN_clock_update(struct mISDNclock *, int, struct timeval *);
 extern unsigned short mISDN_clock_get(void);
+extern const char *mISDNDevName4ch(struct mISDNchannel *);
 #endif /* __KERNEL__ */
 #endif /* mISDNIF_H */
diff --git a/include/linux/mdio-mux.h b/include/linux/mdio-mux.h
new file mode 100644
index 000000000000..a243dbba8659
--- /dev/null
+++ b/include/linux/mdio-mux.h
@@ -0,0 +1,21 @@
+/*
+ * MDIO bus multiplexer framwork.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2011, 2012 Cavium, Inc.
+ */
+#ifndef __LINUX_MDIO_MUX_H
+#define __LINUX_MDIO_MUX_H
+#include <linux/device.h>
+int mdio_mux_init(struct device *dev,
+                  int (*switch_fn) (int cur, int desired, void *data),
+                  void **mux_handle,
+                  void *data);
+void mdio_mux_uninit(void *mux_handle);
+#endif /* __LINUX_MDIO_MUX_H */
diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h
index 53b94e025c7c..912c27a0f7ee 100644
--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h
@@ -22,4 +22,6 @@ extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
                                         void (*hndlr)(struct net_device *),
                                         phy_interface_t iface);
+extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np);
 #endif /* __LINUX_OF_MDIO_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 988fc49667b1..91ad5e227d1d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -645,11 +645,21 @@ static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
        return skb->head + skb->end;
 }
+static inline unsigned int skb_end_offset(const struct sk_buff *skb)
+{
+        return skb->end;
+}
 #else
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
        return skb->end;
 }
+static inline unsigned int skb_end_offset(const struct sk_buff *skb)
+{
+        return skb->end - skb->head;
+}
 #endif
 /* Internal */
@@ -2558,7 +2568,7 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)
                return false;
        skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD);
-        if (skb_end_pointer(skb) - skb->head < skb_size)
+        if (skb_end_offset(skb) < skb_size)
                return false;
        if (skb_shared(skb) || skb_cloned(skb))
@@ -2566,5 +2576,19 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)
        return true;
 }
+/**
+ * skb_head_is_locked - Determine if the skb->head is locked down
+ * @skb: skb to check
+ *
+ * The head on skbs build around a head frag can be removed if they are
+ * not cloned.  This function returns true if the skb head is locked down
+ * due to either being allocated via kmalloc, or by being a clone with
+ * multiple references to the head.
+ */
+static inline bool skb_head_is_locked(const struct sk_buff *skb)
+{
+        return !skb->head_frag || skb_cloned(skb);
+}
 #endif  /* __KERNEL__ */
 #endif  /* _LINUX_SKBUFF_H */
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 278af9ea42d4..d9b42c5be088 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -372,6 +372,8 @@ struct tcp_sock {
                repair      : 1,
                unused      : 1;
        u8      repair_queue;
+        u8      do_early_retrans:1,/* Enable RFC5827 early-retransmit  */
+                early_retrans_delayed:1; /* Delayed ER timer installed */
 /* RTT measurement */
        u32     srtt;           /* smoothed round trip time << 3        */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 0fb84de6da36..92faa6a7ea97 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -252,6 +252,7 @@ extern int sysctl_tcp_max_ssthresh;
 extern int sysctl_tcp_cookie_size;
 extern int sysctl_tcp_thin_linear_timeouts;
 extern int sysctl_tcp_thin_dupack;
+extern int sysctl_tcp_early_retrans;
 extern atomic_long_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
@@ -366,13 +367,6 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 #define TCP_ECN_DEMAND_CWR      4
 #define TCP_ECN_SEEN            8
-static __inline__ void
-TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
-{
-        if (sysctl_tcp_ecn && th->ece && th->cwr)
-                inet_rsk(req)->ecn_ok = 1;
-}
 enum tcp_tw_status {
        TCP_TW_SUCCESS = 0,
        TCP_TW_RST = 1,
@@ -438,7 +432,8 @@ extern int tcp_disconnect(struct sock *sk, int flags);
 void tcp_connect_init(struct sock *sk);
 void tcp_finish_connect(struct sock *sk, struct sk_buff *skb);
-void tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, int hdrlen);
+int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb,
+                               int hdrlen, bool *fragstolen);
 /* From syncookies.c */
 extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS];
@@ -499,6 +494,8 @@ extern void tcp_send_delayed_ack(struct sock *sk);
 /* tcp_input.c */
 extern void tcp_cwnd_application_limited(struct sock *sk);
+extern void tcp_resume_early_retransmit(struct sock *sk);
+extern void tcp_rearm_rto(struct sock *sk);
 /* tcp_timer.c */
 extern void tcp_init_xmit_timers(struct sock *);
@@ -667,6 +664,22 @@ struct tcp_skb_cb {
 #define TCP_SKB_CB(__skb)       ((struct tcp_skb_cb *)&((__skb)->cb[0]))
+/* RFC3168 : 6.1.1 SYN packets must not have ECT/ECN bits set
+ *
+ * If we receive a SYN packet with these bits set, it means a network is
+ * playing bad games with TOS bits. In order to avoid possible false congestion
+ * notifications, we disable TCP ECN negociation.
+ */
+static inline void
+TCP_ECN_create_request(struct request_sock *req, const struct sk_buff *skb)
+{
+        const struct tcphdr *th = tcp_hdr(skb);
+        if (sysctl_tcp_ecn && th->ece && th->cwr &&
+            INET_ECN_is_not_ect(TCP_SKB_CB(skb)->ip_dsfield))
+                inet_rsk(req)->ecn_ok = 1;
+}
 /* Due to TSO, an SKB can be composed of multiple actual
 * packets.  To keep these tracked properly, we use this.
 */
@@ -797,6 +810,21 @@ static inline void tcp_enable_fack(struct tcp_sock *tp)
        tp->rx_opt.sack_ok |= TCP_FACK_ENABLED;
 }
+/* TCP early-retransmit (ER) is similar to but more conservative than
+ * the thin-dupack feature.  Enable ER only if thin-dupack is disabled.
+ */
+static inline void tcp_enable_early_retrans(struct tcp_sock *tp)
+{
+        tp->do_early_retrans = sysctl_tcp_early_retrans &&
+                !sysctl_tcp_thin_dupack && sysctl_tcp_reordering == 3;
+        tp->early_retrans_delayed = 0;
+}
+static inline void tcp_disable_early_retrans(struct tcp_sock *tp)
+{
+        tp->do_early_retrans = 0;
+}
 static inline unsigned int tcp_left_out(const struct tcp_sock *tp)
 {
        return tp->sacked_out + tp->lost_out;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 52ba2b5e803d..2c35da818ef9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -829,7 +829,7 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
 struct sk_buff *skb_copy(const struct sk_buff *skb, gfp_t gfp_mask)
 {
        int headerlen = skb_headroom(skb);
-        unsigned int size = (skb_end_pointer(skb) - skb->head) + skb->data_len;
+        unsigned int size = skb_end_offset(skb) + skb->data_len;
        struct sk_buff *n = alloc_skb(size, gfp_mask);
        if (!n)
@@ -930,9 +930,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
 {
        int i;
        u8 *data;
-        int size = nhead + (skb_end_pointer(skb) - skb->head) + ntail;
+        int size = nhead + skb_end_offset(skb) + ntail;
        long off;
-        bool fastpath;
        BUG_ON(nhead < 0);
@@ -941,27 +940,6 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
        size = SKB_DATA_ALIGN(size);
-        /* Check if we can avoid taking references on fragments if we own
-         * the last reference on skb->head. (see skb_release_data())
-         */
-        if (!skb->cloned)
-                fastpath = true;
-        else {
-                int delta = skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1;
-                fastpath = atomic_read(&skb_shinfo(skb)->dataref) == delta;
-        }
-        if (fastpath && !skb->head_frag &&
-            size + sizeof(struct skb_shared_info) <= ksize(skb->head)) {
-                memmove(skb->head + size, skb_shinfo(skb),
-                        offsetof(struct skb_shared_info,
-                                 frags[skb_shinfo(skb)->nr_frags]));
-                memmove(skb->head + nhead, skb->head,
-                        skb_tail_pointer(skb) - skb->head);
-                off = nhead;
-                goto adjust_others;
-        }
        data = kmalloc(size + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
                       gfp_mask);
        if (!data)
@@ -977,9 +955,12 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
               skb_shinfo(skb),
               offsetof(struct skb_shared_info, frags[skb_shinfo(skb)->nr_frags]));
-        if (fastpath) {
+        /*
-                skb_free_head(skb);
+         * if shinfo is shared we must drop the old head gracefully, but if it
-        } else {
+         * is not we can just drop the old head and let the existing refcount
+         * be since all we did is relocate the values
+         */
+        if (skb_cloned(skb)) {
                /* copy this zero copy skb frags */
                if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
                        if (skb_copy_ubufs(skb, gfp_mask))
@@ -992,12 +973,13 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
                        skb_clone_fraglist(skb);
                skb_release_data(skb);
+        } else {
+                skb_free_head(skb);
        }
        off = (data + nhead) - skb->head;
        skb->head     = data;
        skb->head_frag = 0;
-adjust_others:
        skb->data    += off;
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
        skb->end      = size;
@@ -1699,17 +1681,17 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
                              struct splice_pipe_desc *spd, struct sock *sk)
 {
        int seg;
-        bool head_is_linear = !skb->head_frag;
        /* map the linear part :
-         * If skb->head_frag is set, this 'linear' part is backed
+         * If skb->head_frag is set, this 'linear' part is backed by a
-         * by a fragment, and we can avoid a copy.
+         * fragment, and if the head is not shared with any clones then
+         * we can avoid a copy since we own the head portion of this page.
         */
        if (__splice_segment(virt_to_page(skb->data),
                             (unsigned long) skb->data & (PAGE_SIZE - 1),
                             skb_headlen(skb),
                             offset, len, skb, spd,
-                             head_is_linear,
+                             skb_head_is_locked(skb),
                             sk, pipe))
                return true;
@@ -2745,14 +2727,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
                        if (unlikely(!nskb))
                                goto err;
-                        hsize = skb_end_pointer(nskb) - nskb->head;
+                        hsize = skb_end_offset(nskb);
                        if (skb_cow_head(nskb, doffset + headroom)) {
                                kfree_skb(nskb);
                                goto err;
                        }
-                        nskb->truesize += skb_end_pointer(nskb) - nskb->head -
+                        nskb->truesize += skb_end_offset(nskb) - hsize;
-                                          hsize;
                        skb_release_head_state(nskb);
                        __skb_push(nskb, doffset);
                } else {
@@ -2870,6 +2851,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
        unsigned int len = skb_gro_len(skb);
        unsigned int offset = skb_gro_offset(skb);
        unsigned int headlen = skb_headlen(skb);
+        unsigned int delta_truesize;
        if (p->len + len >= 65536)
                return -E2BIG;
@@ -2899,11 +2881,15 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
                frag->page_offset += offset;
                skb_frag_size_sub(frag, offset);
+                /* all fragments truesize : remove (head size + sk_buff) */
+                delta_truesize = skb->truesize -
+                                 SKB_TRUESIZE(skb_end_offset(skb));
                skb->truesize -= skb->data_len;
                skb->len -= skb->data_len;
                skb->data_len = 0;
-                NAPI_GRO_CB(skb)->free = 1;
+                NAPI_GRO_CB(skb)->free = NAPI_GRO_FREE;
                goto done;
        } else if (skb->head_frag) {
                int nr_frags = pinfo->nr_frags;
@@ -2928,6 +2914,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
                memcpy(frag + 1, skbinfo->frags, sizeof(*frag) * skbinfo->nr_frags);
                /* We dont need to clear skbinfo->nr_frags here */
+                delta_truesize = skb->truesize - SKB_DATA_ALIGN(sizeof(struct sk_buff));
                NAPI_GRO_CB(skb)->free = NAPI_GRO_FREE_STOLEN_HEAD;
                goto done;
        } else if (skb_gro_len(p) != pinfo->gso_size)
@@ -2970,7 +2957,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
        p = nskb;
 merge:
-        p->truesize += skb->truesize - len;
+        delta_truesize = skb->truesize;
        if (offset > headlen) {
                unsigned int eat = offset - headlen;
@@ -2990,7 +2977,7 @@ merge:
 done:
        NAPI_GRO_CB(p)->count++;
        p->data_len += len;
-        p->truesize += len;
+        p->truesize += delta_truesize;
        p->len += len;
        NAPI_GRO_CB(skb)->same_flow = 1;
diff --git a/net/core/sock.c b/net/core/sock.c
index 1a8835117fd6..b8c818e69c23 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -113,6 +113,7 @@
 #include <linux/user_namespace.h>
 #include <linux/static_key.h>
 #include <linux/memcontrol.h>
+#include <linux/prefetch.h>
 #include <asm/uaccess.h>
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 51c6c672c8aa..0d11f234d615 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -673,10 +673,15 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                                break;
                } else {
                        memset(&mreq, 0, sizeof(mreq));
-                        if (optlen >= sizeof(struct in_addr) &&
+                        if (optlen >= sizeof(struct ip_mreq)) {
-                            copy_from_user(&mreq.imr_address, optval,
+                                if (copy_from_user(&mreq, optval,
-                                           sizeof(struct in_addr)))
+                                                   sizeof(struct ip_mreq)))
-                                break;
+                                        break;
+                        } else if (optlen >= sizeof(struct in_addr)) {
+                                if (copy_from_user(&mreq.imr_address, optval,
+                                                   sizeof(struct in_addr)))
+                                        break;
+                        }
                }
                if (!mreq.imr_ifindex) {
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 33417f84e07f..ef32956ed655 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -27,6 +27,7 @@
 #include <net/tcp_memcontrol.h>
 static int zero;
+static int two = 2;
 static int tcp_retr1_max = 255;
 static int ip_local_port_range_min[] = { 1, 1 };
 static int ip_local_port_range_max[] = { 65535, 65535 };
@@ -677,6 +678,15 @@ static struct ctl_table ipv4_table[] = {
                .proc_handler   = proc_dointvec
        },
        {
+                .procname       = "tcp_early_retrans",
+                .data           = &sysctl_tcp_early_retrans,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec_minmax,
+                .extra1         = &zero,
+                .extra2         = &two,
+        },
+        {
                .procname       = "udp_mem",
                .data           = &sysctl_udp_mem,
                .maxlen         = sizeof(sysctl_udp_mem),
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9670af341931..c2cff8b62772 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -395,6 +395,7 @@ void tcp_init_sock(struct sock *sk)
        tp->mss_cache = TCP_MSS_DEFAULT;
        tp->reordering = sysctl_tcp_reordering;
+        tcp_enable_early_retrans(tp);
        icsk->icsk_ca_ops = &tcp_init_congestion_ops;
        sk->sk_state = TCP_CLOSE;
@@ -980,8 +981,8 @@ static inline int select_size(const struct sock *sk, bool sg)
 static int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)
 {
        struct sk_buff *skb;
-        struct tcp_skb_cb *cb;
        struct tcphdr *th;
+        bool fragstolen;
        skb = alloc_skb(size + sizeof(*th), sk->sk_allocation);
        if (!skb)
@@ -994,14 +995,14 @@ static int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)
        if (memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size))
                goto err_free;
-        cb = TCP_SKB_CB(skb);
        TCP_SKB_CB(skb)->seq = tcp_sk(sk)->rcv_nxt;
        TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + size;
        TCP_SKB_CB(skb)->ack_seq = tcp_sk(sk)->snd_una - 1;
-        tcp_queue_rcv(sk, skb, sizeof(*th));
+        if (tcp_queue_rcv(sk, skb, sizeof(*th), &fragstolen)) {
+                WARN_ON_ONCE(fragstolen); /* should not happen */
+                __kfree_skb(skb);
+        }
        return size;
 err_free:
@@ -2495,6 +2496,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
                        err = -EINVAL;
                else
                        tp->thin_dupack = val;
+                        if (tp->thin_dupack)
+                                tcp_disable_early_retrans(tp);
                break;
        case TCP_REPAIR:
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 96a631deb4e6..7b2d351f24db 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -99,6 +99,7 @@ int sysctl_tcp_thin_dupack __read_mostly;
 int sysctl_tcp_moderate_rcvbuf __read_mostly = 1;
 int sysctl_tcp_abc __read_mostly;
+int sysctl_tcp_early_retrans __read_mostly = 2;
 #define FLAG_DATA               0x01 /* Incoming frame contained data.          */
 #define FLAG_WIN_UPDATE         0x02 /* Incoming ACK was a window update.       */
@@ -906,6 +907,7 @@ static void tcp_init_metrics(struct sock *sk)
        if (dst_metric(dst, RTAX_REORDERING) &&
            tp->reordering != dst_metric(dst, RTAX_REORDERING)) {
                tcp_disable_fack(tp);
+                tcp_disable_early_retrans(tp);
                tp->reordering = dst_metric(dst, RTAX_REORDERING);
        }
@@ -988,6 +990,9 @@ static void tcp_update_reordering(struct sock *sk, const int metric,
 #endif
                tcp_disable_fack(tp);
        }
+        if (metric > 0)
+                tcp_disable_early_retrans(tp);
 }
 /* This must be called before lost_out is incremented */
@@ -2339,6 +2344,27 @@ static inline int tcp_dupack_heuristics(const struct tcp_sock *tp)
        return tcp_is_fack(tp) ? tp->fackets_out : tp->sacked_out + 1;
 }
+static bool tcp_pause_early_retransmit(struct sock *sk, int flag)
+{
+        struct tcp_sock *tp = tcp_sk(sk);
+        unsigned long delay;
+        /* Delay early retransmit and entering fast recovery for
+         * max(RTT/4, 2msec) unless ack has ECE mark, no RTT samples
+         * available, or RTO is scheduled to fire first.
+         */
+        if (sysctl_tcp_early_retrans < 2 || (flag & FLAG_ECE) || !tp->srtt)
+                return false;
+        delay = max_t(unsigned long, (tp->srtt >> 5), msecs_to_jiffies(2));
+        if (!time_after(inet_csk(sk)->icsk_timeout, (jiffies + delay)))
+                return false;
+        inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, delay, TCP_RTO_MAX);
+        tp->early_retrans_delayed = 1;
+        return true;
+}
 static inline int tcp_skb_timedout(const struct sock *sk,
                                   const struct sk_buff *skb)
 {
@@ -2446,7 +2472,7 @@ static inline int tcp_head_timedout(const struct sock *sk)
 * Main question: may we further continue forward transmission
 * with the same cwnd?
 */
-static int tcp_time_to_recover(struct sock *sk)
+static int tcp_time_to_recover(struct sock *sk, int flag)
 {
        struct tcp_sock *tp = tcp_sk(sk);
        __u32 packets_out;
@@ -2492,6 +2518,16 @@ static int tcp_time_to_recover(struct sock *sk)
            tcp_is_sack(tp) && !tcp_send_head(sk))
                return 1;
+        /* Trick#6: TCP early retransmit, per RFC5827.  To avoid spurious
+         * retransmissions due to small network reorderings, we implement
+         * Mitigation A.3 in the RFC and delay the retransmission for a short
+         * interval if appropriate.
+         */
+        if (tp->do_early_retrans && !tp->retrans_out && tp->sacked_out &&
+            (tp->packets_out == (tp->sacked_out + 1) && tp->packets_out < 4) &&
+            !tcp_may_send_now(sk))
+                return !tcp_pause_early_retransmit(sk, flag);
        return 0;
 }
@@ -3022,6 +3058,38 @@ static void tcp_update_cwnd_in_recovery(struct sock *sk, int newly_acked_sacked,
        tp->snd_cwnd = tcp_packets_in_flight(tp) + sndcnt;
 }
+static void tcp_enter_recovery(struct sock *sk, bool ece_ack)
+{
+        struct tcp_sock *tp = tcp_sk(sk);
+        int mib_idx;
+        if (tcp_is_reno(tp))
+                mib_idx = LINUX_MIB_TCPRENORECOVERY;
+        else
+                mib_idx = LINUX_MIB_TCPSACKRECOVERY;
+        NET_INC_STATS_BH(sock_net(sk), mib_idx);
+        tp->high_seq = tp->snd_nxt;
+        tp->prior_ssthresh = 0;
+        tp->undo_marker = tp->snd_una;
+        tp->undo_retrans = tp->retrans_out;
+        if (inet_csk(sk)->icsk_ca_state < TCP_CA_CWR) {
+                if (!ece_ack)
+                        tp->prior_ssthresh = tcp_current_ssthresh(sk);
+                tp->snd_ssthresh = inet_csk(sk)->icsk_ca_ops->ssthresh(sk);
+                TCP_ECN_queue_cwr(tp);
+        }
+        tp->bytes_acked = 0;
+        tp->snd_cwnd_cnt = 0;
+        tp->prior_cwnd = tp->snd_cwnd;
+        tp->prr_delivered = 0;
+        tp->prr_out = 0;
+        tcp_set_ca_state(sk, TCP_CA_Recovery);
+}
 /* Process an event, which can update packets-in-flight not trivially.
 * Main goal of this function is to calculate new estimate for left_out,
 * taking into account both packets sitting in receiver's buffer and
@@ -3041,7 +3109,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
        struct tcp_sock *tp = tcp_sk(sk);
        int do_lost = is_dupack || ((flag & FLAG_DATA_SACKED) &&
                                    (tcp_fackets_out(tp) > tp->reordering));
-        int fast_rexmit = 0, mib_idx;
+        int fast_rexmit = 0;
        if (WARN_ON(!tp->packets_out && tp->sacked_out))
                tp->sacked_out = 0;
@@ -3125,7 +3193,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
                if (icsk->icsk_ca_state <= TCP_CA_Disorder)
                        tcp_try_undo_dsack(sk);
-                if (!tcp_time_to_recover(sk)) {
+                if (!tcp_time_to_recover(sk, flag)) {
                        tcp_try_to_open(sk, flag);
                        return;
                }
@@ -3142,32 +3210,7 @@ static void tcp_fastretrans_alert(struct sock *sk, int pkts_acked,
                }
                /* Otherwise enter Recovery state */
+                tcp_enter_recovery(sk, (flag & FLAG_ECE));
-                if (tcp_is_reno(tp))
-                        mib_idx = LINUX_MIB_TCPRENORECOVERY;
-                else
-                        mib_idx = LINUX_MIB_TCPSACKRECOVERY;
-                NET_INC_STATS_BH(sock_net(sk), mib_idx);
-                tp->high_seq = tp->snd_nxt;
-                tp->prior_ssthresh = 0;
-                tp->undo_marker = tp->snd_una;
-                tp->undo_retrans = tp->retrans_out;
-                if (icsk->icsk_ca_state < TCP_CA_CWR) {
-                        if (!(flag & FLAG_ECE))
-                                tp->prior_ssthresh = tcp_current_ssthresh(sk);
-                        tp->snd_ssthresh = icsk->icsk_ca_ops->ssthresh(sk);
-                        TCP_ECN_queue_cwr(tp);
-                }
-                tp->bytes_acked = 0;
-                tp->snd_cwnd_cnt = 0;
-                tp->prior_cwnd = tp->snd_cwnd;
-                tp->prr_delivered = 0;
-                tp->prr_out = 0;
-                tcp_set_ca_state(sk, TCP_CA_Recovery);
                fast_rexmit = 1;
        }
@@ -3249,16 +3292,47 @@ static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
 /* Restart timer after forward progress on connection.
 * RFC2988 recommends to restart timer to now+rto.
 */
-static void tcp_rearm_rto(struct sock *sk)
+void tcp_rearm_rto(struct sock *sk)
 {
-        const struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_sock *tp = tcp_sk(sk);
        if (!tp->packets_out) {
                inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
        } else {
-                inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+                u32 rto = inet_csk(sk)->icsk_rto;
-                                          inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
+                /* Offset the time elapsed after installing regular RTO */
+                if (tp->early_retrans_delayed) {
+                        struct sk_buff *skb = tcp_write_queue_head(sk);
+                        const u32 rto_time_stamp = TCP_SKB_CB(skb)->when + rto;
+                        s32 delta = (s32)(rto_time_stamp - tcp_time_stamp);
+                        /* delta may not be positive if the socket is locked
+                         * when the delayed ER timer fires and is rescheduled.
+                         */
+                        if (delta > 0)
+                                rto = delta;
+                }
+                inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, rto,
+                                          TCP_RTO_MAX);
        }
+        tp->early_retrans_delayed = 0;
+}
+/* This function is called when the delayed ER timer fires. TCP enters
+ * fast recovery and performs fast-retransmit.
+ */
+void tcp_resume_early_retransmit(struct sock *sk)
+{
+        struct tcp_sock *tp = tcp_sk(sk);
+        tcp_rearm_rto(sk);
+        /* Stop if ER is disabled after the delayed ER timer is scheduled */
+        if (!tp->do_early_retrans)
+                return;
+        tcp_enter_recovery(sk, false);
+        tcp_update_scoreboard(sk, 1);
+        tcp_xmit_retransmit_queue(sk);
 }
 /* If we get here, the whole TSO packet has not been acked. */
@@ -3707,6 +3781,9 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
        if (after(ack, tp->snd_nxt))
                goto invalid_ack;
+        if (tp->early_retrans_delayed)
+                tcp_rearm_rto(sk);
        if (after(ack, prior_snd_una))
                flag |= FLAG_SND_UNA_ADVANCED;
@@ -4455,6 +4532,7 @@ static inline int tcp_try_rmem_schedule(struct sock *sk, unsigned int size)
 * @sk: socket
 * @to: prior buffer
 * @from: buffer to add in queue
+ * @fragstolen: pointer to boolean
 *
 * Before queueing skb @from after @to, try to merge them
 * to reduce overall memory use and queue lengths, if cost is small.
@@ -4467,59 +4545,82 @@ static bool tcp_try_coalesce(struct sock *sk,
                             struct sk_buff *from,
                             bool *fragstolen)
 {
-        int delta, len = from->len;
+        int i, delta, len = from->len;
        *fragstolen = false;
-        if (tcp_hdr(from)->fin)
+        if (tcp_hdr(from)->fin || skb_cloned(to))
                return false;
        if (len <= skb_tailroom(to)) {
                BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));
-merge:
+                goto merge;
-                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRCVCOALESCE);
-                TCP_SKB_CB(to)->end_seq = TCP_SKB_CB(from)->end_seq;
-                TCP_SKB_CB(to)->ack_seq = TCP_SKB_CB(from)->ack_seq;
-                return true;
        }
        if (skb_has_frag_list(to) || skb_has_frag_list(from))
                return false;
-        if (skb_headlen(from) == 0 &&
+        if (skb_headlen(from) != 0) {
-            (skb_shinfo(to)->nr_frags +
-             skb_shinfo(from)->nr_frags <= MAX_SKB_FRAGS)) {
-                WARN_ON_ONCE(from->head_frag);
-                delta = from->truesize - ksize(from->head) -
-                        SKB_DATA_ALIGN(sizeof(struct sk_buff));
-                WARN_ON_ONCE(delta < len);
-copyfrags:
-                memcpy(skb_shinfo(to)->frags + skb_shinfo(to)->nr_frags,
-                       skb_shinfo(from)->frags,
-                       skb_shinfo(from)->nr_frags * sizeof(skb_frag_t));
-                skb_shinfo(to)->nr_frags += skb_shinfo(from)->nr_frags;
-                skb_shinfo(from)->nr_frags = 0;
-                to->truesize += delta;
-                atomic_add(delta, &sk->sk_rmem_alloc);
-                sk_mem_charge(sk, delta);
-                to->len += len;
-                to->data_len += len;
-                goto merge;
-        }
-        if (from->head_frag) {
                struct page *page;
                unsigned int offset;
-                if (skb_shinfo(to)->nr_frags + skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS)
+                if (skb_shinfo(to)->nr_frags +
+                    skb_shinfo(from)->nr_frags >= MAX_SKB_FRAGS)
                        return false;
+                if (skb_head_is_locked(from))
+                        return false;
+                delta = from->truesize - SKB_DATA_ALIGN(sizeof(struct sk_buff));
                page = virt_to_head_page(from->head);
                offset = from->data - (unsigned char *)page_address(page);
                skb_fill_page_desc(to, skb_shinfo(to)->nr_frags,
                                   page, offset, skb_headlen(from));
                *fragstolen = true;
-                delta = len; /* we dont know real truesize... */
+        } else {
-                goto copyfrags;
+                if (skb_shinfo(to)->nr_frags +
+                    skb_shinfo(from)->nr_frags > MAX_SKB_FRAGS)
+                        return false;
+                delta = from->truesize -
+                        SKB_TRUESIZE(skb_end_pointer(from) - from->head);
        }
-        return false;
+        WARN_ON_ONCE(delta < len);
+        memcpy(skb_shinfo(to)->frags + skb_shinfo(to)->nr_frags,
+               skb_shinfo(from)->frags,
+               skb_shinfo(from)->nr_frags * sizeof(skb_frag_t));
+        skb_shinfo(to)->nr_frags += skb_shinfo(from)->nr_frags;
+        if (!skb_cloned(from))
+                skb_shinfo(from)->nr_frags = 0;
+        /* if the skb is cloned this does nothing since we set nr_frags to 0 */
+        for (i = 0; i < skb_shinfo(from)->nr_frags; i++)
+                skb_frag_ref(from, i);
+        to->truesize += delta;
+        atomic_add(delta, &sk->sk_rmem_alloc);
+        sk_mem_charge(sk, delta);
+        to->len += len;
+        to->data_len += len;
+merge:
+        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPRCVCOALESCE);
+        TCP_SKB_CB(to)->end_seq = TCP_SKB_CB(from)->end_seq;
+        TCP_SKB_CB(to)->ack_seq = TCP_SKB_CB(from)->ack_seq;
+        return true;
+}
+static void kfree_skb_partial(struct sk_buff *skb, bool head_stolen)
+{
+        if (head_stolen)
+                kmem_cache_free(skbuff_head_cache, skb);
+        else
+                __kfree_skb(skb);
 }
 static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
@@ -4565,10 +4666,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
                if (!tcp_try_coalesce(sk, skb1, skb, &fragstolen)) {
                        __skb_queue_after(&tp->out_of_order_queue, skb1, skb);
                } else {
-                        if (fragstolen)
+                        kfree_skb_partial(skb, fragstolen);
-                                kmem_cache_free(skbuff_head_cache, skb);
-                        else
-                                __kfree_skb(skb);
                        skb = NULL;
                }
@@ -4645,6 +4743,22 @@ end:
                skb_set_owner_r(skb, sk);
 }
+int tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, int hdrlen,
+                  bool *fragstolen)
+{
+        int eaten;
+        struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
+        __skb_pull(skb, hdrlen);
+        eaten = (tail &&
+                 tcp_try_coalesce(sk, tail, skb, fragstolen)) ? 1 : 0;
+        tcp_sk(sk)->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
+        if (!eaten) {
+                __skb_queue_tail(&sk->sk_receive_queue, skb);
+                skb_set_owner_r(skb, sk);
+        }
+        return eaten;
+}
 static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
 {
@@ -4691,20 +4805,12 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
                }
                if (eaten <= 0) {
-                        struct sk_buff *tail;
 queue_and_out:
                        if (eaten < 0 &&
                            tcp_try_rmem_schedule(sk, skb->truesize))
                                goto drop;
-                        tail = skb_peek_tail(&sk->sk_receive_queue);
+                        eaten = tcp_queue_rcv(sk, skb, 0, &fragstolen);
-                        eaten = (tail &&
-                                 tcp_try_coalesce(sk, tail, skb,
-                                                  &fragstolen)) ? 1 : 0;
-                        if (eaten <= 0) {
-                                skb_set_owner_r(skb, sk);
-                                __skb_queue_tail(&sk->sk_receive_queue, skb);
-                        }
                }
                tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
                if (skb->len)
@@ -4727,12 +4833,9 @@ queue_and_out:
                tcp_fast_path_check(sk);
-                if (eaten > 0) {
+                if (eaten > 0)
-                        if (fragstolen)
+                        kfree_skb_partial(skb, fragstolen);
-                                kmem_cache_free(skbuff_head_cache, skb);
+                else if (!sock_flag(sk, SOCK_DEAD))
-                        else
-                                __kfree_skb(skb);
-                } else if (!sock_flag(sk, SOCK_DEAD))
                        sk->sk_data_ready(sk, 0);
                return;
        }
@@ -5402,14 +5505,6 @@ discard:
        return 0;
 }
-void tcp_queue_rcv(struct sock *sk, struct sk_buff *skb, int hdrlen)
-{
-        __skb_pull(skb, hdrlen);
-        __skb_queue_tail(&sk->sk_receive_queue, skb);
-        skb_set_owner_r(skb, sk);
-        tcp_sk(sk)->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
-}
 /*
 *      TCP receive function for the ESTABLISHED state.
 *
@@ -5518,6 +5613,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
                } else {
                        int eaten = 0;
                        int copied_early = 0;
+                        bool fragstolen = false;
                        if (tp->copied_seq == tp->rcv_nxt &&
                            len - tcp_header_len <= tp->ucopy.len) {
@@ -5575,7 +5671,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
                                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPHPHITS);
                                /* Bulk data transfer: receiver */
-                                tcp_queue_rcv(sk, skb, tcp_header_len);
+                                eaten = tcp_queue_rcv(sk, skb, tcp_header_len,
+                                                      &fragstolen);
                        }
                        tcp_event_data_recv(sk, skb);
@@ -5597,7 +5694,7 @@ no_ack:
                        else
 #endif
                        if (eaten)
-                                __kfree_skb(skb);
+                                kfree_skb_partial(skb, fragstolen);
                        else
                                sk->sk_data_ready(sk, 0);
                        return 0;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index cf97e9821d76..4ff5e1f70d16 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1368,7 +1368,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
                goto drop_and_free;
        if (!want_cookie || tmp_opt.tstamp_ok)
-                TCP_ECN_create_request(req, tcp_hdr(skb));
+                TCP_ECN_create_request(req, skb);
        if (want_cookie) {
                isn = cookie_v4_init_sequence(sk, skb, &req->mss);
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 3cabafb5cdd1..6f6a91832826 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -482,6 +482,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
                newtp->sacked_out = 0;
                newtp->fackets_out = 0;
                newtp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
+                tcp_enable_early_retrans(newtp);
                /* So many TCP implementations out there (incorrectly) count the
                 * initial SYN frame in their delayed-ACK and congestion control
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 834e89fc541b..d94733009923 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -78,9 +78,8 @@ static void tcp_event_new_data_sent(struct sock *sk, const struct sk_buff *skb)
                tp->frto_counter = 3;
        tp->packets_out += tcp_skb_pcount(skb);
-        if (!prior_packets)
+        if (!prior_packets || tp->early_retrans_delayed)
-                inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+                tcp_rearm_rto(sk);
-                                          inet_csk(sk)->icsk_rto, TCP_RTO_MAX);
 }
 /* SND.NXT, if window was not shrunk.
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 34d4a02c2f16..e911e6c523ec 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -319,6 +319,11 @@ void tcp_retransmit_timer(struct sock *sk)
        struct tcp_sock *tp = tcp_sk(sk);
        struct inet_connection_sock *icsk = inet_csk(sk);
+        if (tp->early_retrans_delayed) {
+                tcp_resume_early_retransmit(sk);
+                return;
+        }
        if (!tp->packets_out)
                goto out;
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 57b210969834..078d039e8fd2 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1140,7 +1140,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
        treq->rmt_addr = ipv6_hdr(skb)->saddr;
        treq->loc_addr = ipv6_hdr(skb)->daddr;
        if (!want_cookie || tmp_opt.tstamp_ok)
-                TCP_ECN_create_request(req, tcp_hdr(skb));
+                TCP_ECN_create_request(req, skb);
        treq->iif = sk->sk_bound_dev_if;
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 81445cc8196f..cc37dd52ecf9 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -332,15 +332,13 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        }
        q->stats.pdrop++;
-        sch->qstats.drops++;
+        return qdisc_drop(skb, sch);
-        kfree_skb(skb);
-        return NET_XMIT_DROP;
- congestion_drop:
+congestion_drop:
        qdisc_drop(skb, sch);
        return NET_XMIT_CN;
- other_drop:
+other_drop:
        if (ret & __NET_XMIT_BYPASS)
                sch->qstats.drops++;
        kfree_skb(skb);
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 389b856c6653..3886365cc207 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -265,8 +265,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        return NET_XMIT_SUCCESS;
 drop:
-        kfree_skb(skb);
+        qdisc_drop(skb, sch);
-        sch->qstats.drops++;
        return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
 }
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 2ea6f196e3c8..acae5b0e3849 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -558,9 +558,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                        __skb_queue_tail(&q->direct_queue, skb);
                        q->direct_pkts++;
                } else {
-                        kfree_skb(skb);
+                        return qdisc_drop(skb, sch);
-                        sch->qstats.drops++;
-                        return NET_XMIT_DROP;
                }
 #ifdef CONFIG_NET_CLS_ACT
        } else if (!cl) {
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 45326599fda3..ca0c29695d51 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -88,9 +88,7 @@ teql_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                return NET_XMIT_SUCCESS;
        }
-        kfree_skb(skb);
+        return qdisc_drop(skb, sch);
-        sch->qstats.drops++;
-        return NET_XMIT_DROP;
 }
 static struct sk_buff *