diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 20:46:44 +0000 |
| commit | 973a971d5a5ef0d6a60e5c9b0df675fef6be3383 (patch) | |
| tree | d49729a4bff6fd5bdacfcc57e7ba44911fd8812c /drivers/net/loopback.c | |
| parent | f4bafd5dc0d4f03f6dc4466d233a4601c54d40b3 (diff) | |
| parent | a75952b72a0fff3031124003e62118111aed42c1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'drivers/net/loopback.c')
| -rw-r--r-- | drivers/net/loopback.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 3b43bfd85a0..b1ac63ab8c1 100644 --- a/drivers/net/loopback.c +++ b/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 */ |