diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/net/loopback.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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 3b43bfd85a0f..b1ac63ab8c16 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) | |||
| 76 | 76 | ||
| 77 | skb->protocol = eth_type_trans(skb,dev); | 77 | skb->protocol = eth_type_trans(skb,dev); |
| 78 | 78 | ||
| 79 | #ifdef LOOPBACK_TSO | ||
| 80 | if (skb_is_gso(skb)) { | ||
| 81 | BUG_ON(skb->protocol != htons(ETH_P_IP)); | ||
| 82 | BUG_ON(ip_hdr(skb)->protocol != IPPROTO_TCP); | ||
| 83 | |||
| 84 | emulate_large_send_offload(skb); | ||
| 85 | return 0; | ||
| 86 | } | ||
| 87 | #endif | ||
| 88 | dev->last_rx = jiffies; | 79 | dev->last_rx = jiffies; |
| 89 | 80 | ||
| 90 | /* it's OK to use per_cpu_ptr() because BHs are off */ | 81 | /* it's OK to use per_cpu_ptr() because BHs are off */ |