net/core: Uninline skb_bond().
authorJoe Eykholt <jre@nuovasystems.com>
Thu, 3 Jul 2008 01:22:00 +0000 (18:22 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 7 Aug 2008 07:59:58 +0000 (03:59 -0400)
Otherwise subsequent changes need multiple return values.

Signed-off-by: Joe Eykholt <jre@nuovasystems.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
net/core/dev.c

index 01993ad74e760235267e0ade106bdcac16ae6890..4a09833331f16806db514c0de7918538861713e6 100644 (file)
@@ -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);
@@ -2194,10 +2178,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;
+       orig_dev = skb->dev;
+       if (orig_dev->master) {
+               if (skb_bond_should_drop(skb)) {
+                       kfree_skb(skb);
+                       return NET_RX_DROP;
+               }
+               skb->dev = orig_dev->master;
+       }
 
        __get_cpu_var(netdev_rx_stat).total++;