3 files changed, 1 insertions, 27 deletions

diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index adb4bf5eb4b4..ede8daa68275 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -723,25 +723,6 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 pr_debug("%s: el3_start_xmit(length = %u) called, status %4.4x.\n",
                            dev->name, skb->len, inw(ioaddr + EL3_STATUS));
         }
-#if 0
-#ifndef final_version
-        {       /* Error-checking code, delete someday. */
-                ushort status = inw(ioaddr + EL3_STATUS);
-                if (status & 0x0001 &&          /* IRQ line active, missed one. */
-                    inw(ioaddr + EL3_STATUS) & 1) {                     /* Make sure. */
-                        pr_debug("%s: Missed interrupt, status then %04x now %04x"
-                                   "  Tx %2.2x Rx %4.4x.\n", dev->name, status,
-                                   inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS),
-                                   inw(ioaddr + RX_STATUS));
-                        /* Fake interrupt trigger by masking, acknowledge interrupts. */
-                        outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
-                        outw(AckIntr | IntLatch | TxAvailable | RxEarly | IntReq,
-                                 ioaddr + EL3_CMD);
-                        outw(SetStatusEnb | 0xff, ioaddr + EL3_CMD);
-                }
-        }
-#endif
-#endif
         /*
          *      We lock the driver against other processors. Note
          *      we don't need to lock versus the IRQ as we suspended
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 33dc6f2418f2..42e9dd05c936 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2745,11 +2745,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         if (mdp->cd->tsu) {
                 struct resource *rtsu;
                 rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-                if (!rtsu) {
-                        dev_err(&pdev->dev, "Not found TSU resource\n");
-                        ret = -ENODEV;
-                        goto out_release;
-                }
                 mdp->tsu_addr = devm_ioremap_resource(&pdev->dev, rtsu);
                 if (IS_ERR(mdp->tsu_addr)) {
                         ret = PTR_ERR(mdp->tsu_addr);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 08bbe6096528..b358e8c98607 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -360,9 +360,7 @@ static void tcp_fixup_rcvbuf(struct sock *sk)
         if (mss > 1460)
                 icwnd = max_t(u32, (1460 * TCP_DEFAULT_INIT_RCVWND) / mss, 2);
 
-        rcvmem = SKB_TRUESIZE(mss + MAX_TCP_HEADER);
-        while (tcp_win_from_space(rcvmem) < mss)
-                rcvmem += 128;
+        rcvmem = 2 * SKB_TRUESIZE(mss + MAX_TCP_HEADER);
 
         rcvmem *= icwnd;