From 6bdc8b72dbbc9429a32ab420e3d569a98c7ae30b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 7 Jul 2011 02:41:59 -0700
Subject: [PATCH] --- yaml --- r: 256145 b: refs/heads/master c:
 fa366124ef3aab35e378ae141f379c133d839943 h: refs/heads/master i:   256143:
 5156b8a2cb3c82088f2328d3efc97dbd34cd7cd8 v: v3

---
 [refs]                      | 2 +-
 trunk/net/rose/rose_link.c  | 7 -------
 trunk/net/rose/rose_route.c | 5 -----
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 3f0a485825ac..d11f9564beea 100644
--- 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
index fa5f5641a2c2..7a02bd1cc5a0 100644
--- 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
index 479cae57d187..d389de197089 100644
--- 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];