bridge: Use BR_INPUT_SKB_CB on xmit path

this patch makes BR_INPUT_SKB_CB available on the xmit path so
that we could avoid passing the br pointer around for the purpose
of collecting device statistics.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 1a99c4e04e85f63f5ee0527d1952ac2239aabc9e..be356293caa17d30a15b3eee0fc4695aa2b3d4d5 100644 (file)
--- a/net/bridge/br_device.c
+++ b/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/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 6cd50c6e57cf1936db03fbab001018fe16cdeb62..2e1cb434f6cd3471b4b479731cc2257ba9276bad 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/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;
                }
        }