USB Storage: unusual_devs.h entry for Sony Ericsson P990i

[safe/jmp/linux-2.6] / drivers / net / loopback.c

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index b79d6e8..f429b19 100644 (file)
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -74,7 +74,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)
        struct iphdr *iph = skb->nh.iph;
        struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4));
        unsigned int doffset = (iph->ihl + th->doff) * 4;
-       unsigned int mtu = skb_shinfo(skb)->tso_size + doffset;
+       unsigned int mtu = skb_shinfo(skb)->gso_size + doffset;
        unsigned int offset = 0;
        u32 seq = ntohl(th->seq);
        u16 id  = ntohs(iph->id);
@@ -139,7 +139,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
 
 #ifdef LOOPBACK_TSO
-       if (skb_shinfo(skb)->tso_size) {
+       if (skb_is_gso(skb)) {
                BUG_ON(skb->protocol != htons(ETH_P_IP));
                BUG_ON(skb->nh.iph->protocol != IPPROTO_TCP);
 
@@ -181,7 +181,7 @@ static struct net_device_stats *get_stats(struct net_device *dev)
                stats->rx_packets += lb_stats->rx_packets;
                stats->tx_packets += lb_stats->tx_packets;
        }
-                               
+
        return stats;
 }
 
@@ -190,7 +190,7 @@ static u32 loopback_get_link(struct net_device *dev)
        return 1;
 }
 
-static struct ethtool_ops loopback_ethtool_ops = {
+static const struct ethtool_ops loopback_ethtool_ops = {
        .get_link               = loopback_get_link,
        .get_tso                = ethtool_op_get_tso,
        .set_tso                = ethtool_op_set_tso,
@@ -230,7 +230,7 @@ int __init loopback_init(void)
                loopback_dev.priv = stats;
                loopback_dev.get_stats = &get_stats;
        }
-       
+
        return register_netdev(&loopback_dev);
 };