Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2 files changed, 13 insertions, 49 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 01993ad74e76..600bb23c4c2e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1939,22 +1939,6 @@ int netif_rx_ni(struct sk_buff *skb)
 
 EXPORT_SYMBOL(netif_rx_ni);
 
-static inline struct net_device *skb_bond(struct sk_buff *skb)
-{
-        struct net_device *dev = skb->dev;
-
-        if (dev->master) {
-                if (skb_bond_should_drop(skb)) {
-                        kfree_skb(skb);
-                        return NULL;
-                }
-                skb->dev = dev->master;
-        }
-
-        return dev;
-}
-
-
 static void net_tx_action(struct softirq_action *h)
 {
         struct softnet_data *sd = &__get_cpu_var(softnet_data);
@@ -2181,6 +2165,7 @@ int netif_receive_skb(struct sk_buff *skb)
 {
         struct packet_type *ptype, *pt_prev;
         struct net_device *orig_dev;
+        struct net_device *null_or_orig;
         int ret = NET_RX_DROP;
         __be16 type;
 
@@ -2194,10 +2179,14 @@ int netif_receive_skb(struct sk_buff *skb)
         if (!skb->iif)
                 skb->iif = skb->dev->ifindex;
 
-        orig_dev = skb_bond(skb);
-
-        if (!orig_dev)
-                return NET_RX_DROP;
+        null_or_orig = NULL;
+        orig_dev = skb->dev;
+        if (orig_dev->master) {
+                if (skb_bond_should_drop(skb))
+                        null_or_orig = orig_dev; /* deliver only exact match */
+                else
+                        skb->dev = orig_dev->master;
+        }
 
         __get_cpu_var(netdev_rx_stat).total++;
 
@@ -2221,7 +2210,8 @@ int netif_receive_skb(struct sk_buff *skb)
 #endif
 
         list_for_each_entry_rcu(ptype, &ptype_all, list) {
-                if (!ptype->dev || ptype->dev == skb->dev) {
+                if (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
+                    ptype->dev == orig_dev) {
                         if (pt_prev)
                                 ret = deliver_skb(skb, pt_prev, orig_dev);
                         pt_prev = ptype;
@@ -2246,7 +2236,8 @@ ncls:
         list_for_each_entry_rcu(ptype,
                         &ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
                 if (ptype->type == type &&
-                    (!ptype->dev || ptype->dev == skb->dev)) {
+                    (ptype->dev == null_or_orig || ptype->dev == skb->dev ||
+                     ptype->dev == orig_dev)) {
                         if (pt_prev)
                                 ret = deliver_skb(skb, pt_prev, orig_dev);
                         pt_prev = ptype;
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index b210a88d0960..7f07152bc109 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -57,7 +57,6 @@
 #include <linux/vmalloc.h>      /* vmalloc, vfree */
 #include <asm/uaccess.h>        /* copy_to/from_user */
 #include <linux/init.h>         /* __initfunc et al. */
-#include <net/syncppp.h>
 
 #define KMEM_SAFETYZONE 8
 
@@ -567,9 +566,6 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
 {
         wanif_conf_t *cnf;
         struct net_device *dev = NULL;
-#ifdef CONFIG_WANPIPE_MULTPPP
-        struct ppp_device *pppdev=NULL;
-#endif
         int err;
 
         if ((wandev->state == WAN_UNCONFIGURED) || (wandev->new_if == NULL))
@@ -588,25 +584,10 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
                 goto out;
 
         if (cnf->config_id == WANCONFIG_MPPP) {
-#ifdef CONFIG_WANPIPE_MULTPPP
-                pppdev = kzalloc(sizeof(struct ppp_device), GFP_KERNEL);
-                err = -ENOBUFS;
-                if (pppdev == NULL)
-                        goto out;
-                pppdev->dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
-                if (pppdev->dev == NULL) {
-                        kfree(pppdev);
-                        err = -ENOBUFS;
-                        goto out;
-                }
-                err = wandev->new_if(wandev, (struct net_device *)pppdev, cnf);
-                dev = pppdev->dev;
-#else
                 printk(KERN_INFO "%s: Wanpipe Mulit-Port PPP support has not been compiled in!\n",
                                 wandev->name);
                 err = -EPROTONOSUPPORT;
                 goto out;
-#endif
         } else {
                 dev = kzalloc(sizeof(struct net_device), GFP_KERNEL);
                 err = -ENOBUFS;
@@ -661,17 +642,9 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
         kfree(dev->priv);
         dev->priv = NULL;
 
-#ifdef CONFIG_WANPIPE_MULTPPP
-        if (cnf->config_id == WANCONFIG_MPPP)
-                kfree(pppdev);
-        else
-                kfree(dev);
-#else
         /* Sync PPP is disabled */
         if (cnf->config_id != WANCONFIG_MPPP)
                 kfree(dev);
-#endif
-
 out:
         kfree(cnf);
         return err;