Merge branch 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kerne...

[linux-2.6-block.git] / net / 8021q / vlan_dev.c

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index ad5e2fd1012c4c1fdfedf010055acfae003646e4..e7e62570bdb869f64e7198c53357e18702165bf1 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -551,6 +551,7 @@ static int vlan_dev_init(struct net_device *dev)
        dev->features |= real_dev->vlan_features | NETIF_F_LLTX |
                         NETIF_F_GSO_SOFTWARE;
        dev->gso_max_size = real_dev->gso_max_size;
+       dev->gso_max_segs = real_dev->gso_max_segs;
        if (dev->features & NETIF_F_VLAN_FEATURES)
                netdev_warn(real_dev, "VLAN features are set incorrectly.  Q-in-Q configurations may not work correctly.\n");
 
@@ -621,12 +622,12 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
        return features;
 }
 
-static int vlan_ethtool_get_settings(struct net_device *dev,
-                                    struct ethtool_cmd *cmd)
+static int vlan_ethtool_get_link_ksettings(struct net_device *dev,
+                                          struct ethtool_link_ksettings *cmd)
 {
        const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
 
-       return __ethtool_get_settings(vlan->real_dev, cmd);
+       return __ethtool_get_link_ksettings(vlan->real_dev, cmd);
 }
 
 static void vlan_ethtool_get_drvinfo(struct net_device *dev,
@@ -741,7 +742,7 @@ static int vlan_dev_get_iflink(const struct net_device *dev)
 }
 
 static const struct ethtool_ops vlan_ethtool_ops = {
-       .get_settings           = vlan_ethtool_get_settings,
+       .get_link_ksettings     = vlan_ethtool_get_link_ksettings,
        .get_drvinfo            = vlan_ethtool_get_drvinfo,
        .get_link               = ethtool_op_get_link,
        .get_ts_info            = vlan_ethtool_get_ts_info,
@@ -799,6 +800,7 @@ void vlan_setup(struct net_device *dev)
        ether_setup(dev);
 
        dev->priv_flags         |= IFF_802_1Q_VLAN | IFF_NO_QUEUE;
+       dev->priv_flags         |= IFF_UNICAST_FLT;
        dev->priv_flags         &= ~IFF_TX_SKB_SHARING;
        netif_keep_dst(dev);