diff --git a/[refs] b/[refs] index eb0690d9602d..a0a93f28c127 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5e7ad44d05d3f8227a10a17761505fce2c08e38 +refs/heads/master: 3a8af722495469e9c550386b910c5b93c91cf107 diff --git a/trunk/drivers/net/loopback.c b/trunk/drivers/net/loopback.c index 3b43bfd85a0f..b1ac63ab8c16 100644 --- a/trunk/drivers/net/loopback.c +++ b/trunk/drivers/net/loopback.c @@ -76,15 +76,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) skb->protocol = eth_type_trans(skb,dev); -#ifdef LOOPBACK_TSO - if (skb_is_gso(skb)) { - BUG_ON(skb->protocol != htons(ETH_P_IP)); - BUG_ON(ip_hdr(skb)->protocol != IPPROTO_TCP); - - emulate_large_send_offload(skb); - return 0; - } -#endif dev->last_rx = jiffies; /* it's OK to use per_cpu_ptr() because BHs are off */