Re: PATCH Fix bonding active-backup behavior for VLAN interfaces

[Ben Greear <greearb@candelatech.com>]

This patch by itself does nothing useful, other than remove a method.

If we assume you did the patch backwards, and wanted to add the method
instead, then where is this method ever called?

Ben


Christophe Devriese wrote:
> diff -rU3 linux-2.6.17.7/net/core/dev.c linux-2.6.17.7-wapper/net/core/dev.c
> --- linux-2.6.17.7/net/core/dev.c       2006-07-25 05:36:01.000000000 +0200
> +++ linux-2.6.17.7-wapper/net/core/dev.c        2006-07-27 20:16:36.000000000 +0200
> @@ -88,6 +88,7 @@
>  #include <linux/sockios.h>
>  #include <linux/errno.h>
>  #include <linux/interrupt.h>
> +#include <linux/if_bonding.h>
>  #include <linux/if_ether.h>
>  #include <linux/netdevice.h>
>  #include <linux/etherdevice.h>
> @@ -1518,37 +1519,6 @@
> 
>  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) {
> -               /*
> -                * On bonding slaves other than the currently active
> -                * slave, suppress duplicates except for 802.3ad
> -                * ETH_P_SLOW and alb non-mcast/bcast.
> -                */
> -               if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
> -                       if (dev->master->priv_flags & IFF_MASTER_ALB) {
> -                               if (skb->pkt_type != PACKET_BROADCAST &&
> -                                   skb->pkt_type != PACKET_MULTICAST)
> -                                       goto keep;
> -                       }
> -
> -                       if (dev->master->priv_flags & IFF_MASTER_8023AD &&
> -                           skb->protocol == __constant_htons(ETH_P_SLOW))
> -                               goto keep;
> -
> -                       kfree_skb(skb);
> -                       return NULL;
> -               }
> -keep:
> -               skb->dev = dev->master;
> -       }
> -
> -       return dev;
> -}
> -
>  static void net_tx_action(struct softirq_action *h)
>  {
>         struct softnet_data *sd = &__get_cpu_var(softnet_data);
> 


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com