Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / drivers / net / macvlan.c

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 9bf46bd19b87bf947fd79e547bdde626c8a12097..24ea994b6274c324143973a74aeedf78088ffc74 100644 (file)
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -120,7 +120,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb,
        struct net_device *dev = vlan->dev;
 
        if (local)
-               return vlan->forward(dev, skb);
+               return dev_forward_skb(dev, skb);
 
        skb->dev = dev;
        if (ether_addr_equal_64bits(eth->h_dest, dev->broadcast))
@@ -128,7 +128,7 @@ static int macvlan_broadcast_one(struct sk_buff *skb,
        else
                skb->pkt_type = PACKET_MULTICAST;
 
-       return vlan->receive(skb);
+       return netif_rx(skb);
 }
 
 static u32 macvlan_hash_mix(const struct macvlan_dev *vlan)
@@ -251,7 +251,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
        skb->dev = dev;
        skb->pkt_type = PACKET_HOST;
 
-       ret = vlan->receive(skb);
+       ret = netif_rx(skb);
 
 out:
        macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0);
@@ -297,7 +297,13 @@ netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
        int ret;
        const struct macvlan_dev *vlan = netdev_priv(dev);
 
-       ret = macvlan_queue_xmit(skb, dev);
+       if (vlan->fwd_priv) {
+               skb->dev = vlan->lowerdev;
+               ret = dev_hard_start_xmit(skb, skb->dev, NULL, vlan->fwd_priv);
+       } else {
+               ret = macvlan_queue_xmit(skb, dev);
+       }
+
        if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
                struct macvlan_pcpu_stats *pcpu_stats;
 
@@ -347,6 +353,21 @@ static int macvlan_open(struct net_device *dev)
                goto hash_add;
        }
 
+       if (lowerdev->features & NETIF_F_HW_L2FW_DOFFLOAD) {
+               vlan->fwd_priv =
+                     lowerdev->netdev_ops->ndo_dfwd_add_station(lowerdev, dev);
+
+               /* If we get a NULL pointer back, or if we get an error
+                * then we should just fall through to the non accelerated path
+                */
+               if (IS_ERR_OR_NULL(vlan->fwd_priv)) {
+                       vlan->fwd_priv = NULL;
+               } else {
+                       dev->features &= ~NETIF_F_LLTX;
+                       return 0;
+               }
+       }
+
        err = -EBUSY;
        if (macvlan_addr_busy(vlan->port, dev->dev_addr))
                goto out;
@@ -367,6 +388,11 @@ hash_add:
 del_unicast:
        dev_uc_del(lowerdev, dev->dev_addr);
 out:
+       if (vlan->fwd_priv) {
+               lowerdev->netdev_ops->ndo_dfwd_del_station(lowerdev,
+                                                          vlan->fwd_priv);
+               vlan->fwd_priv = NULL;
+       }
        return err;
 }
 
@@ -375,6 +401,13 @@ static int macvlan_stop(struct net_device *dev)
        struct macvlan_dev *vlan = netdev_priv(dev);
        struct net_device *lowerdev = vlan->lowerdev;
 
+       if (vlan->fwd_priv) {
+               lowerdev->netdev_ops->ndo_dfwd_del_station(lowerdev,
+                                                          vlan->fwd_priv);
+               vlan->fwd_priv = NULL;
+               return 0;
+       }
+
        dev_uc_unsync(lowerdev, dev);
        dev_mc_unsync(lowerdev, dev);
 
@@ -501,6 +534,7 @@ static int macvlan_init(struct net_device *dev)
 {
        struct macvlan_dev *vlan = netdev_priv(dev);
        const struct net_device *lowerdev = vlan->lowerdev;
+       int i;
 
        dev->state              = (dev->state & ~MACVLAN_STATE_MASK) |
                                  (lowerdev->state & MACVLAN_STATE_MASK);
@@ -516,6 +550,12 @@ static int macvlan_init(struct net_device *dev)
        if (!vlan->pcpu_stats)
                return -ENOMEM;
 
+       for_each_possible_cpu(i) {
+               struct macvlan_pcpu_stats *mvlstats;
+               mvlstats = per_cpu_ptr(vlan->pcpu_stats, i);
+               u64_stats_init(&mvlstats->syncp);
+       }
+
        return 0;
 }
 
@@ -763,10 +803,7 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[])
 }
 
 int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
-                          struct nlattr *tb[], struct nlattr *data[],
-                          int (*receive)(struct sk_buff *skb),
-                          int (*forward)(struct net_device *dev,
-                                         struct sk_buff *skb))
+                          struct nlattr *tb[], struct nlattr *data[])
 {
        struct macvlan_dev *vlan = netdev_priv(dev);
        struct macvlan_port *port;
@@ -780,13 +817,11 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
        if (lowerdev == NULL)
                return -ENODEV;
 
-       /* When creating macvlans on top of other macvlans - use
+       /* When creating macvlans or macvtaps on top of other macvlans - use
         * the real device as the lowerdev.
         */
-       if (lowerdev->rtnl_link_ops == dev->rtnl_link_ops) {
-               struct macvlan_dev *lowervlan = netdev_priv(lowerdev);
-               lowerdev = lowervlan->lowerdev;
-       }
+       if (netif_is_macvlan(lowerdev))
+               lowerdev = macvlan_dev_real_dev(lowerdev);
 
        if (!tb[IFLA_MTU])
                dev->mtu = lowerdev->mtu;
@@ -810,8 +845,6 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
        vlan->lowerdev = lowerdev;
        vlan->dev      = dev;
        vlan->port     = port;
-       vlan->receive  = receive;
-       vlan->forward  = forward;
        vlan->set_features = MACVLAN_FEATURES;
 
        vlan->mode     = MACVLAN_MODE_VEPA;
@@ -828,22 +861,22 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
                eth_hw_addr_inherit(dev, lowerdev);
        }
 
+       port->count += 1;
+       err = register_netdevice(dev);
+       if (err < 0)
+               goto destroy_port;
+
+       dev->priv_flags |= IFF_MACVLAN;
        err = netdev_upper_dev_link(lowerdev, dev);
        if (err)
                goto destroy_port;
 
-       port->count += 1;
-       err = register_netdevice(dev);
-       if (err < 0)
-               goto upper_dev_unlink;
 
        list_add_tail_rcu(&vlan->list, &port->vlans);
        netif_stacked_transfer_operstate(lowerdev, dev);
 
        return 0;
 
-upper_dev_unlink:
-       netdev_upper_dev_unlink(lowerdev, dev);
 destroy_port:
        port->count -= 1;
        if (!port->count)
@@ -856,9 +889,7 @@ EXPORT_SYMBOL_GPL(macvlan_common_newlink);
 static int macvlan_newlink(struct net *src_net, struct net_device *dev,
                           struct nlattr *tb[], struct nlattr *data[])
 {
-       return macvlan_common_newlink(src_net, dev, tb, data,
-                                     netif_rx,
-                                     dev_forward_skb);
+       return macvlan_common_newlink(src_net, dev, tb, data);
 }
 
 void macvlan_dellink(struct net_device *dev, struct list_head *head)