[HIPPI/FDDI]: Make {hippi,fddi}_type_trans set skb->dev

[powerpc.git] / net / 802 / fddi.c

diff --git a/net/802/fddi.c b/net/802/fddi.c
index ace6386..f8a0c9f 100644 (file)
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -100,7 +100,7 @@ static int fddi_rebuild_header(struct sk_buff       *skb)
        struct fddihdr *fddi = (struct fddihdr *)skb->data;
 
 #ifdef CONFIG_INET
-       if (fddi->hdr.llc_snap.ethertype == __constant_htons(ETH_P_IP))
+       if (fddi->hdr.llc_snap.ethertype == htons(ETH_P_IP))
                /* Try to get ARP to resolve the header and fill destination address */
                return arp_find(fddi->daddr, skb);
        else
@@ -130,12 +130,13 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
         * to start of packet data.  Assume 802.2 SNAP frames for now.
         */
 
+       skb->dev = dev;
        skb->mac.raw = skb->data;       /* point to frame control (FC) */
 
        if(fddi->hdr.llc_8022_1.dsap==0xe0)
        {
                skb_pull(skb, FDDI_K_8022_HLEN-3);
-               type = __constant_htons(ETH_P_802_2);
+               type = htons(ETH_P_802_2);
        }
        else
        {