From 247549509201d489bf6243d1c3a230eb15154f07 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sat, 27 Feb 2010 19:41:42 +0000 Subject: [PATCH] --- yaml --- r: 184565 b: refs/heads/master c: 6088a539d8d1666dca6979b5759bf966ee9124ef h: refs/heads/master i: 184563: d5c3fd66243bc4fcbdc64cdf70dc2bfefa15df27 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_device.c | 2 ++ trunk/net/bridge/br_forward.c | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9003a95a8f6..aec16358694c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b33084be192ee1e347d98bb5c9e38a53d98d35e2 +refs/heads/master: 6088a539d8d1666dca6979b5759bf966ee9124ef diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c index 1a99c4e04e85..be356293caa1 100644 --- a/trunk/net/bridge/br_device.c +++ b/trunk/net/bridge/br_device.c @@ -26,6 +26,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) const unsigned char *dest = skb->data; struct net_bridge_fdb_entry *dst; + BR_INPUT_SKB_CB(skb)->brdev = dev; + dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; diff --git a/trunk/net/bridge/br_forward.c b/trunk/net/bridge/br_forward.c index 6cd50c6e57cf..2e1cb434f6cd 100644 --- a/trunk/net/bridge/br_forward.c +++ b/trunk/net/bridge/br_forward.c @@ -111,6 +111,7 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, { struct net_bridge_port *p; struct net_bridge_port *prev; + struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev; prev = NULL; @@ -120,7 +121,7 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, struct sk_buff *skb2; if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL) { - br->dev->stats.tx_dropped++; + dev->stats.tx_dropped++; goto out; } @@ -137,7 +138,7 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, if (skb0) { skb = skb_clone(skb, GFP_ATOMIC); if (!skb) { - br->dev->stats.tx_dropped++; + dev->stats.tx_dropped++; goto out; } }