2014-01-26 19:30:34 +08:00
|
|
|
--- a/drivers/net/ethernet/ralink/ralink_soc_eth.c
|
|
|
|
|
+++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
|
|
|
|
|
@@ -335,7 +335,7 @@ static int fe_start_xmit(struct sk_buff
|
2013-12-28 05:14:49 +08:00
|
|
|
if (priv->soc->tso)
|
|
|
|
|
fe_start_tso(skb, dev, nr_frags, tx);
|
|
|
|
|
|
|
|
|
|
- if (skb_shinfo(skb)->gso_segs > 1) {
|
|
|
|
|
+ if (priv->soc->tso && (skb_shinfo(skb)->gso_segs > 1)) {
|
|
|
|
|
struct iphdr *iph = NULL;
|
|
|
|
|
struct tcphdr *th = NULL;
|
|
|
|
|
struct ipv6hdr *ip6h = NULL;
|
2014-01-26 19:30:34 +08:00
|
|
|
@@ -741,8 +741,7 @@ static int fe_probe(struct platform_devi
|
2014-01-12 20:07:20 +08:00
|
|
|
dev_info(&pdev->dev, "Enabling TSO\n");
|
|
|
|
|
netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_IPV6_CSUM;
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
- netdev->hw_features = netdev->vlan_features = netdev->features;
|
|
|
|
|
+ netdev->hw_features = netdev->features;
|
|
|
|
|
|
|
|
|
|
netdev->irq = platform_get_irq(pdev, 0);
|
|
|
|
|
if (netdev->irq < 0) {
|
