Merge branch 'netfilter-flowtable'

[linux-2.6-microblaze.git] / drivers / net / wan / lapbether.c

diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 605fe55..45d7428 100644 (file)
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -51,6 +51,8 @@ struct lapbethdev {
        struct list_head        node;
        struct net_device       *ethdev;        /* link to ethernet device */
        struct net_device       *axdev;         /* lapbeth device (lapb#) */
+       bool                    up;
+       spinlock_t              up_lock;        /* Protects "up" */
 };
 
 static LIST_HEAD(lapbeth_devices);
@@ -101,8 +103,9 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
        rcu_read_lock();
        lapbeth = lapbeth_get_x25_dev(dev);
        if (!lapbeth)
-               goto drop_unlock;
-       if (!netif_running(lapbeth->axdev))
+               goto drop_unlock_rcu;
+       spin_lock_bh(&lapbeth->up_lock);
+       if (!lapbeth->up)
                goto drop_unlock;
 
        len = skb->data[0] + skb->data[1] * 256;
@@ -117,11 +120,14 @@ static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
                goto drop_unlock;
        }
 out:
+       spin_unlock_bh(&lapbeth->up_lock);
        rcu_read_unlock();
        return 0;
 drop_unlock:
        kfree_skb(skb);
        goto out;
+drop_unlock_rcu:
+       rcu_read_unlock();
 drop:
        kfree_skb(skb);
        return 0;
@@ -151,13 +157,11 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
 static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
                                      struct net_device *dev)
 {
+       struct lapbethdev *lapbeth = netdev_priv(dev);
        int err;
 
-       /*
-        * Just to be *really* sure not to send anything if the interface
-        * is down, the ethernet device may have gone.
-        */
-       if (!netif_running(dev))
+       spin_lock_bh(&lapbeth->up_lock);
+       if (!lapbeth->up)
                goto drop;
 
        /* There should be a pseudo header of 1 byte added by upper layers.
@@ -194,6 +198,7 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
                goto drop;
        }
 out:
+       spin_unlock_bh(&lapbeth->up_lock);
        return NETDEV_TX_OK;
 drop:
        kfree_skb(skb);
@@ -285,6 +290,7 @@ static const struct lapb_register_struct lapbeth_callbacks = {
  */
 static int lapbeth_open(struct net_device *dev)
 {
+       struct lapbethdev *lapbeth = netdev_priv(dev);
        int err;
 
        if ((err = lapb_register(dev, &lapbeth_callbacks)) != LAPB_OK) {
@@ -292,15 +298,21 @@ static int lapbeth_open(struct net_device *dev)
                return -ENODEV;
        }
 
-       netif_start_queue(dev);
+       spin_lock_bh(&lapbeth->up_lock);
+       lapbeth->up = true;
+       spin_unlock_bh(&lapbeth->up_lock);
+
        return 0;
 }
 
 static int lapbeth_close(struct net_device *dev)
 {
+       struct lapbethdev *lapbeth = netdev_priv(dev);
        int err;
 
-       netif_stop_queue(dev);
+       spin_lock_bh(&lapbeth->up_lock);
+       lapbeth->up = false;
+       spin_unlock_bh(&lapbeth->up_lock);
 
        if ((err = lapb_unregister(dev)) != LAPB_OK)
                pr_err("lapb_unregister error: %d\n", err);
@@ -359,6 +371,9 @@ static int lapbeth_new_device(struct net_device *dev)
        dev_hold(dev);
        lapbeth->ethdev = dev;
 
+       lapbeth->up = false;
+       spin_lock_init(&lapbeth->up_lock);
+
        rc = -EIO;
        if (register_netdevice(ndev))
                goto fail;
@@ -406,8 +421,8 @@ static int lapbeth_device_event(struct notifier_block *this,
                if (lapbeth_get_x25_dev(dev) == NULL)
                        lapbeth_new_device(dev);
                break;
-       case NETDEV_DOWN:       
-               /* ethernet device closed -> close LAPB interface */
+       case NETDEV_GOING_DOWN:
+               /* ethernet device closes -> close LAPB interface */
                lapbeth = lapbeth_get_x25_dev(dev);
                if (lapbeth) 
                        dev_close(lapbeth->axdev);