Changeset 47749


Ignore:
Timestamp:
2015-12-04T10:45:07+01:00 (2 years ago)
Author:
jogo
Message:

kernel: mvswitch: merge 3.10+ compile fix into the code

The lowest we support is 3.18, so no need to keep it as a separate
patch.

Signed-off-by: Jonas Gorski <jogo@…>

Location:
trunk/target/linux/generic
Files:
4 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/files/drivers/net/phy/mvswitch.c

    r35512 r47749  
    174174                return; 
    175175 
    176         __vlan_hwaccel_put_tag(skb, vlan); 
     176        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan); 
    177177} 
    178178 
     
    308308#ifdef HEADER_MODE 
    309309        dev->priv_flags |= IFF_NO_IP_ALIGN; 
    310         dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; 
     310        dev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX; 
    311311#else 
    312         dev->features |= NETIF_F_HW_VLAN_RX; 
     312        dev->features |= NETIF_F_HW_VLAN_CTAG_RX; 
    313313#endif 
    314314 
Note: See TracChangeset for help on using the changeset viewer.