From fd3d7d6e33f5143de9109f71a1ed8d7efc7e486f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 16 Mar 2010 14:37:47 -0700 Subject: [PATCH] --- yaml --- r: 188160 b: refs/heads/master c: 87faf3ccf1c939938600ab57c6c9ed5bd2e5f4cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_forward.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 89ce7637e8a5..76b48abbde5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 +refs/heads/master: 87faf3ccf1c939938600ab57c6c9ed5bd2e5f4cc diff --git a/trunk/net/bridge/br_forward.c b/trunk/net/bridge/br_forward.c index 8347916efe88..8dbec83e50ca 100644 --- a/trunk/net/bridge/br_forward.c +++ b/trunk/net/bridge/br_forward.c @@ -19,7 +19,8 @@ #include #include "br_private.h" -static int deliver_clone(struct net_bridge_port *prev, struct sk_buff *skb, +static int deliver_clone(const struct net_bridge_port *prev, + struct sk_buff *skb, void (*__packet_hook)(const struct net_bridge_port *p, struct sk_buff *skb)); @@ -112,7 +113,8 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk kfree_skb(skb); } -static int deliver_clone(struct net_bridge_port *prev, struct sk_buff *skb, +static int deliver_clone(const struct net_bridge_port *prev, + struct sk_buff *skb, void (*__packet_hook)(const struct net_bridge_port *p, struct sk_buff *skb)) {