[2.6 patch] net/802/fc.c: #if 0 fc_type_trans

[2.6 patch] net/802/fc.c: #if 0 fc_type_trans

[Adrian Bunk]

The only user of fc_type_trans (drivers/net/fc/iph5526.c) is BROKEN in 
2.6 and removed in -mm.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 include/linux/fcdevice.h |    2 --
 net/802/fc.c             |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.11-mm1-full/include/linux/fcdevice.h.old	2005-03-06 21:40:36.000000000 +0100
+++ linux-2.6.11-mm1-full/include/linux/fcdevice.h	2005-03-06 21:41:07.000000000 +0100
@@ -24,12 +24,10 @@
 #define _LINUX_FCDEVICE_H
 
 
 #include <linux/if_fc.h>
 
 #ifdef __KERNEL__
-extern unsigned short	fc_type_trans(struct sk_buff *skb, struct net_device *dev); 
-
 extern struct net_device *alloc_fcdev(int sizeof_priv);
 #endif
 
 #endif	/* _LINUX_FCDEVICE_H */
--- linux-2.6.11-mm1-full/net/802/fc.c.old	2005-03-06 21:41:12.000000000 +0100
+++ linux-2.6.11-mm1-full/net/802/fc.c	2005-03-06 21:41:35.000000000 +0100
@@ -94,12 +94,13 @@
 	return arp_find(fch->daddr, skb);
 #else
 	return 0;
 #endif
 }
 
+#if 0
 unsigned short
 fc_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
 	struct fch_hdr *fch = (struct fch_hdr *)skb->data;
 	struct fcllc *fcllc;
 
@@ -127,12 +128,13 @@
 		skb_pull(skb, sizeof (struct fcllc));
 		return fcllc->ethertype;
 	}
 
 	return ntohs(ETH_P_802_2);
 }
+#endif  /*  0  */
 
 static void fc_setup(struct net_device *dev)
 {
 	dev->hard_header	= fc_header;
 	dev->rebuild_header	= fc_rebuild_header;
                 

Re: [2.6 patch] net/802/fc.c: #if 0 fc_type_trans

[David S. Miller]

On Sun, 6 Mar 2005 21:57:54 +0100
Adrian Bunk <bunk@stusta.de> wrote:

> The only user of fc_type_trans (drivers/net/fc/iph5526.c) is BROKEN in 
> 2.6 and removed in -mm.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

That driver isn't in Linus's tree any longer either.  Just delete
the thing altogether instead of #if 0'ing it.

Thanks.

[2.6 patch] net/802/fc.c: remove fc_type_trans

[Adrian Bunk]

On Mon, Mar 14, 2005 at 09:49:40PM -0800, David S. Miller wrote:
> On Sun, 6 Mar 2005 21:57:54 +0100
> Adrian Bunk <bunk@stusta.de> wrote:
> 
> > The only user of fc_type_trans (drivers/net/fc/iph5526.c) is BROKEN in 
> > 2.6 and removed in -mm.
> > 
> > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> That driver isn't in Linus's tree any longer either.  Just delete
> the thing altogether instead of #if 0'ing it.
>...

Updated patch:


<--  snip  -->


The only user of fc_type_trans (drivers/net/fc/iph5526.c) is removed in 
Linus' tree.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 include/linux/fcdevice.h |    2 --
 net/802/fc.c             |   34 ----------------------------------
 2 files changed, 36 deletions(-)

--- linux-2.6.11-mm1-full/include/linux/fcdevice.h.old	2005-03-06 21:40:36.000000000 +0100
+++ linux-2.6.11-mm1-full/include/linux/fcdevice.h	2005-03-06 21:41:07.000000000 +0100
@@ -24,12 +24,10 @@
 #define _LINUX_FCDEVICE_H
 
 
 #include <linux/if_fc.h>
 
 #ifdef __KERNEL__
-extern unsigned short	fc_type_trans(struct sk_buff *skb, struct net_device *dev); 
-
 extern struct net_device *alloc_fcdev(int sizeof_priv);
 #endif
 
 #endif	/* _LINUX_FCDEVICE_H */
--- linux-2.6.11-mm3-full/net/802/fc.c.old	2005-03-15 13:02:13.000000000 +0100
+++ linux-2.6.11-mm3-full/net/802/fc.c	2005-03-15 13:02:34.000000000 +0100
@@ -97,40 +97,6 @@
 #endif
 }
 
-unsigned short
-fc_type_trans(struct sk_buff *skb, struct net_device *dev)
-{
-	struct fch_hdr *fch = (struct fch_hdr *)skb->data;
-	struct fcllc *fcllc;
-
-	skb->mac.raw = skb->data;
-	fcllc = (struct fcllc *)(skb->data + sizeof (struct fch_hdr) + 2);
-	skb_pull(skb, sizeof (struct fch_hdr) + 2);
-
-	if (*fch->daddr & 1) {
-		if (!memcmp(fch->daddr, dev->broadcast, FC_ALEN))
-			skb->pkt_type = PACKET_BROADCAST;
-		else
-			skb->pkt_type = PACKET_MULTICAST;
-	} else if (dev->flags & IFF_PROMISC) {
-		if (memcmp(fch->daddr, dev->dev_addr, FC_ALEN))
-			skb->pkt_type = PACKET_OTHERHOST;
-	}
-
-	/*
-	 * Strip the SNAP header from ARP packets since we don't pass
-	 * them through to the 802.2/SNAP layers.
-	 */
-	if (fcllc->dsap == EXTENDED_SAP &&
-	    (fcllc->ethertype == ntohs(ETH_P_IP) ||
-	     fcllc->ethertype == ntohs(ETH_P_ARP))) {
-		skb_pull(skb, sizeof (struct fcllc));
-		return fcllc->ethertype;
-	}
-
-	return ntohs(ETH_P_802_2);
-}
-
 static void fc_setup(struct net_device *dev)
 {
 	dev->hard_header	= fc_header;

Re: [2.6 patch] net/802/fc.c: remove fc_type_trans

[David S. Miller]

On Tue, 15 Mar 2005 13:20:17 +0100
Adrian Bunk <bunk@stusta.de> wrote:

> On Mon, Mar 14, 2005 at 09:49:40PM -0800, David S. Miller wrote:
> > On Sun, 6 Mar 2005 21:57:54 +0100
> > Adrian Bunk <bunk@stusta.de> wrote:
> > 
> > > The only user of fc_type_trans (drivers/net/fc/iph5526.c) is BROKEN in 
> > > 2.6 and removed in -mm.
> > > 
> > > Signed-off-by: Adrian Bunk <bunk@stusta.de>
> > 
> > That driver isn't in Linus's tree any longer either.  Just delete
> > the thing altogether instead of #if 0'ing it.
> >...
> 
> Updated patch:

Applied, thanks a lot Adrian.