ipvlan: fix various issues in ipvlan_process_multicast()

[linux.git] / drivers / net / ipvlan / ipvlan_main.c

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 0fef17874d5031f48f186b639763a3b09b446d2e..8b0f99300cbc97d8c8b93c3dfa99cd841914c086 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -26,13 +26,13 @@ static struct nf_hook_ops ipvl_nfops[] __read_mostly = {
        },
 };
 
-static struct l3mdev_ops ipvl_l3mdev_ops __read_mostly = {
+static const struct l3mdev_ops ipvl_l3mdev_ops = {
        .l3mdev_l3_rcv = ipvlan_l3_rcv,
 };
 
 static void ipvlan_adjust_mtu(struct ipvl_dev *ipvlan, struct net_device *dev)
 {
-       ipvlan->dev->mtu = dev->mtu - ipvlan->mtu_adj;
+       ipvlan->dev->mtu = dev->mtu;
 }
 
 static int ipvlan_register_nf_hook(void)
@@ -128,13 +128,14 @@ static int ipvlan_port_create(struct net_device *dev)
        return 0;
 
 err:
-       kfree_rcu(port, rcu);
+       kfree(port);
        return err;
 }
 
 static void ipvlan_port_destroy(struct net_device *dev)
 {
        struct ipvl_port *port = ipvlan_port_get_rtnl(dev);
+       struct sk_buff *skb;
 
        dev->priv_flags &= ~IFF_IPVLAN_MASTER;
        if (port->mode == IPVLAN_MODE_L3S) {
@@ -144,8 +145,12 @@ static void ipvlan_port_destroy(struct net_device *dev)
        }
        netdev_rx_handler_unregister(dev);
        cancel_work_sync(&port->wq);
-       __skb_queue_purge(&port->backlog);
-       kfree_rcu(port, rcu);
+       while ((skb = __skb_dequeue(&port->backlog)) != NULL) {
+               if (skb->dev)
+                       dev_put(skb->dev);
+               kfree_skb(skb);
+       }
+       kfree(port);
 }
 
 #define IPVLAN_FEATURES \
@@ -546,13 +551,15 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
        }
        err = ipvlan_set_port_mode(port, mode);
        if (err) {
-               goto unregister_netdev;
+               goto unlink_netdev;
        }
 
        list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
        netif_stacked_transfer_operstate(phy_dev, dev);
        return 0;
 
+unlink_netdev:
+       netdev_upper_dev_unlink(phy_dev, dev);
 unregister_netdev:
        unregister_netdevice(dev);
 destroy_ipvlan_port: