---

yaml --- r: 188160 b: refs/heads/master c: 87faf3c h: refs/heads/master v: v3
git-mirror · Mar 16, 2010 · fd3d7d6 · fd3d7d6
1 parent 8123905
commit fd3d7d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -19,7 +19,8 @@
 #include <linux/netfilter_bridge.h>
 #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))
 {