switch the am335x-evmsk to the new wlcore bindings
[openwrt/staging/wigyori.git] / target / linux / ramips / patches-3.10 / 999-raeth_fixes.patch
1 --- a/drivers/net/ethernet/ralink/ralink_soc_eth.c
2 +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
3 @@ -335,7 +335,7 @@ static int fe_start_xmit(struct sk_buff
4 if (priv->soc->tso)
5 fe_start_tso(skb, dev, nr_frags, tx);
6
7 - if (skb_shinfo(skb)->gso_segs > 1) {
8 + if (priv->soc->tso && (skb_shinfo(skb)->gso_segs > 1)) {
9 struct iphdr *iph = NULL;
10 struct tcphdr *th = NULL;
11 struct ipv6hdr *ip6h = NULL;
12 @@ -741,8 +741,7 @@ static int fe_probe(struct platform_devi
13 dev_info(&pdev->dev, "Enabling TSO\n");
14 netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_IPV6_CSUM;
15 }
16 -
17 - netdev->hw_features = netdev->vlan_features = netdev->features;
18 + netdev->hw_features = netdev->features;
19
20 netdev->irq = platform_get_irq(pdev, 0);
21 if (netdev->irq < 0) {