netdev
[Top] [All Lists]

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

To: davem@xxxxxxxxxxxxx
Subject: [2.6 patch] net/802/fc.c: #if 0 fc_type_trans
From: Adrian Bunk <bunk@xxxxxxxxx>
Date: Sun, 6 Mar 2005 21:57:54 +0100
Cc: netdev@xxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.5.6+20040907i
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@xxxxxxxxx>

---

 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;
                 


<Prev in Thread] Current Thread [Next in Thread>