---

yaml --- r: 256145 b: refs/heads/master c: fa36612 h: refs/heads/master i: 256143: 5156b8a v: v3
git-mirror · Jul 7, 2011 · 6bdc8b7 · 6bdc8b7
1 parent 541f6c7
commit 6bdc8b7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a9d69179f294691bdfd1278f64212a9a7815b0e
+refs/heads/master: fa366124ef3aab35e378ae141f379c133d839943
diff --git a/trunk/net/rose/rose_link.c b/trunk/net/rose/rose_link.c
@@ -266,13 +266,6 @@ void rose_transmit_link(struct sk_buff *skb, struct rose_neigh *neigh)
 {
 	unsigned char *dptr;
 
-#if 0
-	if (call_fw_firewall(PF_ROSE, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT) {
-		kfree_skb(skb);
-		return;
-	}
-#endif
-
 	if (neigh->loopback) {
 		rose_loopback_queue(skb, neigh);
 		return;

diff --git a/trunk/net/rose/rose_route.c b/trunk/net/rose/rose_route.c
@@ -864,11 +864,6 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25)
 	int res = 0;
 	char buf[11];
 
-#if 0
-	if (call_in_firewall(PF_ROSE, skb->dev, skb->data, NULL, &skb) != FW_ACCEPT)
-		return res;
-#endif
-
 	if (skb->len < ROSE_MIN_LEN)
 		return res;
 	frametype = skb->data[2];