Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

4 files changed, 96 insertions, 4 deletions

diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 6719af6a59fa..651babdfab38 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -139,6 +139,43 @@ static struct net_device *br2684_find_dev(const struct br2684_if_spec *s)
         return NULL;
 }
 
+static int atm_dev_event(struct notifier_block *this, unsigned long event,
+                 void *arg)
+{
+        struct atm_dev *atm_dev = arg;
+        struct list_head *lh;
+        struct net_device *net_dev;
+        struct br2684_vcc *brvcc;
+        struct atm_vcc *atm_vcc;
+        unsigned long flags;
+
+        pr_debug("event=%ld dev=%p\n", event, atm_dev);
+
+        read_lock_irqsave(&devs_lock, flags);
+        list_for_each(lh, &br2684_devs) {
+                net_dev = list_entry_brdev(lh);
+
+                list_for_each_entry(brvcc, &BRPRIV(net_dev)->brvccs, brvccs) {
+                        atm_vcc = brvcc->atmvcc;
+                        if (atm_vcc && brvcc->atmvcc->dev == atm_dev) {
+
+                                if (atm_vcc->dev->signal == ATM_PHY_SIG_LOST)
+                                        netif_carrier_off(net_dev);
+                                else
+                                        netif_carrier_on(net_dev);
+
+                        }
+                }
+        }
+        read_unlock_irqrestore(&devs_lock, flags);
+
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block atm_dev_notifier = {
+        .notifier_call = atm_dev_event,
+};
+
 /* chained vcc->pop function.  Check if we should wake the netif_queue */
 static void br2684_pop(struct atm_vcc *vcc, struct sk_buff *skb)
 {
@@ -362,6 +399,12 @@ static void br2684_push(struct atm_vcc *atmvcc, struct sk_buff *skb)
                         unregister_netdev(net_dev);
                         free_netdev(net_dev);
                 }
+                read_lock_irq(&devs_lock);
+                if (list_empty(&br2684_devs)) {
+                        /* last br2684 device */
+                        unregister_atmdevice_notifier(&atm_dev_notifier);
+                }
+                read_unlock_irq(&devs_lock);
                 return;
         }
 
@@ -530,6 +573,13 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg)
 
                 br2684_push(atmvcc, skb);
         }
+
+        /* initialize netdev carrier state */
+        if (atmvcc->dev->signal == ATM_PHY_SIG_LOST)
+                netif_carrier_off(net_dev);
+        else
+                netif_carrier_on(net_dev);
+
         __module_get(THIS_MODULE);
         return 0;
 
@@ -620,9 +670,16 @@ static int br2684_create(void __user *arg)
         }
 
         write_lock_irq(&devs_lock);
+
         brdev->payload = payload;
-        brdev->number = list_empty(&br2684_devs) ? 1 :
-            BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
+
+        if (list_empty(&br2684_devs)) {
+                /* 1st br2684 device */
+                register_atmdevice_notifier(&atm_dev_notifier);
+                brdev->number = 1;
+        } else
+                brdev->number = BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
+
         list_add_tail(&brdev->br2684_devs, &br2684_devs);
         write_unlock_irq(&devs_lock);
         return 0;
@@ -772,6 +829,11 @@ static void __exit br2684_exit(void)
         remove_proc_entry("br2684", atm_proc_root);
 #endif
 
+
+        /* if not already empty */
+        if (!list_empty(&br2684_devs))
+                unregister_atmdevice_notifier(&atm_dev_notifier);
+
         while (!list_empty(&br2684_devs)) {
                 net_dev = list_entry_brdev(br2684_devs.next);
                 brdev = BRPRIV(net_dev);
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 313aba11316b..95fdd1185067 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -522,7 +522,7 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip)
         error = ip_route_output_key(&init_net, &rt, &fl);
         if (error)
                 return error;
-        neigh = __neigh_lookup(&clip_tbl, &ip, rt->u.dst.dev, 1);
+        neigh = __neigh_lookup(&clip_tbl, &ip, rt->dst.dev, 1);
         ip_rt_put(rt);
         if (!neigh)
                 return -ENOMEM;
diff --git a/net/atm/common.c b/net/atm/common.c
index b43feb1a3995..940404a73b3d 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -37,6 +37,8 @@ EXPORT_SYMBOL(vcc_hash);
 DEFINE_RWLOCK(vcc_sklist_lock);
 EXPORT_SYMBOL(vcc_sklist_lock);
 
+static ATOMIC_NOTIFIER_HEAD(atm_dev_notify_chain);
+
 static void __vcc_insert_socket(struct sock *sk)
 {
         struct atm_vcc *vcc = atm_sk(sk);
@@ -212,6 +214,22 @@ void vcc_release_async(struct atm_vcc *vcc, int reply)
 }
 EXPORT_SYMBOL(vcc_release_async);
 
+void atm_dev_signal_change(struct atm_dev *dev, char signal)
+{
+        pr_debug("%s signal=%d dev=%p number=%d dev->signal=%d\n",
+                __func__, signal, dev, dev->number, dev->signal);
+
+        /* atm driver sending invalid signal */
+        WARN_ON(signal < ATM_PHY_SIG_LOST || signal > ATM_PHY_SIG_FOUND);
+
+        if (dev->signal == signal)
+                return; /* no change */
+
+        dev->signal = signal;
+
+        atomic_notifier_call_chain(&atm_dev_notify_chain, signal, dev);
+}
+EXPORT_SYMBOL(atm_dev_signal_change);
 
 void atm_dev_release_vccs(struct atm_dev *dev)
 {
@@ -781,6 +799,18 @@ int vcc_getsockopt(struct socket *sock, int level, int optname,
         return vcc->dev->ops->getsockopt(vcc, level, optname, optval, len);
 }
 
+int register_atmdevice_notifier(struct notifier_block *nb)
+{
+        return atomic_notifier_chain_register(&atm_dev_notify_chain, nb);
+}
+EXPORT_SYMBOL_GPL(register_atmdevice_notifier);
+
+void unregister_atmdevice_notifier(struct notifier_block *nb)
+{
+        atomic_notifier_chain_unregister(&atm_dev_notify_chain, nb);
+}
+EXPORT_SYMBOL_GPL(unregister_atmdevice_notifier);
+
 static int __init atm_init(void)
 {
         int error;
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c
index e49bb6d948a1..e9aced0ec56b 100644
--- a/net/atm/pppoatm.c
+++ b/net/atm/pppoatm.c
@@ -260,7 +260,7 @@ static int pppoatm_devppp_ioctl(struct ppp_channel *chan, unsigned int cmd,
         return -ENOTTY;
 }
 
-static /*const*/ struct ppp_channel_ops pppoatm_ops = {
+static const struct ppp_channel_ops pppoatm_ops = {
         .start_xmit = pppoatm_send,
         .ioctl = pppoatm_devppp_ioctl,
 };