Bart De Schuymer wrote:
> --- linux-2.6.33/net/bridge/br_device.c 2010-02-24 19:52:17.000000000 +0100
> +++ linux-2.6.33-uml/net/bridge/br_device.c 2010-03-30 14:15:19.000000000 +0200
> @@ -15,7 +15,7 @@
> #include <linux/netdevice.h>
> #include <linux/etherdevice.h>
> #include <linux/ethtool.h>
> -
> +#include <linux/netfilter_bridge.h>
> #include <asm/uaccess.h>
> #include "br_private.h"
>
> @@ -26,12 +26,19 @@ netdev_tx_t br_dev_xmit(struct sk_buff *
> const unsigned char *dest = skb->data;
> struct net_bridge_fdb_entry *dst;
>
> - dev->stats.tx_packets++;
> - dev->stats.tx_bytes += skb->len;
> -
> skb_reset_mac_header(skb);
> skb_pull(skb, ETH_HLEN);
>
> +#ifdef CONFIG_BRIDGE_NETFILTER
> + if (skb->nf_bridge && (skb->nf_bridge->mask & BRNF_BRIDGED_DNAT)) {
> + br_nf_pre_routing_finish_bridge_slow(skb);
> + return NETDEV_TX_OK;
> + }
> +#endif
> +
> + dev->stats.tx_packets++;
> + dev->stats.tx_bytes += skb->len;
This changes how packets are counted by moving the statistics
update after the skb_pull() call.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
