4 files changed, 18 insertions, 14 deletions

diff --git a/net/802/fddi.c b/net/802/fddi.c
index ace6386384bc..91dde41b5481 100644
--- 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->mac.raw = skb->data;       /* point to frame control (FC) */
+        skb->dev = dev;
+        skb_reset_mac_header(skb);      /* 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
         {
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 578f2a3d692d..87ffc12b6891 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -60,7 +60,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
          * Due to the stupidity of the little endian byte-order we
          * have to set the fp field this way.
          */
-        hip->fp.fixed           = __constant_htonl(0x04800018);
+        hip->fp.fixed           = htonl(0x04800018);
         hip->fp.d2_size         = htonl(len + 8);
         hip->le.fc              = 0;
         hip->le.double_wide     = 0;    /* only HIPPI 800 for the time being */
@@ -104,7 +104,7 @@ static int hippi_rebuild_header(struct sk_buff *skb)
          * Only IP is currently supported
          */
 
-        if(hip->snap.ethertype != __constant_htons(ETH_P_IP))
+        if(hip->snap.ethertype != htons(ETH_P_IP))
         {
                 printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype));
                 return 0;
@@ -126,14 +126,14 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         struct hippi_hdr *hip;
 
-        hip = (struct hippi_hdr *) skb->data;
-
         /*
          * This is actually wrong ... question is if we really should
          * set the raw address here.
          */
-         skb->mac.raw = skb->data;
-         skb_pull(skb, HIPPI_HLEN);
+        skb->dev = dev;
+        skb_reset_mac_header(skb);
+        hip = (struct hippi_hdr *)skb_mac_header(skb);
+        skb_pull(skb, HIPPI_HLEN);
 
         /*
          * No fancy promisc stuff here now.
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6e7c2120b83f..04ee43e7538f 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -56,10 +56,10 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
         };
 
         rcu_read_lock();
-        proto = find_snap_client(skb->h.raw);
+        proto = find_snap_client(skb_transport_header(skb));
         if (proto) {
                 /* Pass the frame on. */
-                skb->h.raw  += 5;
+                skb->transport_header += 5;
                 skb_pull_rcsum(skb, 5);
                 rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
         } else {
diff --git a/net/802/tr.c b/net/802/tr.c
index 96bd14452c55..0ba1946211c9 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -189,11 +189,13 @@ static int tr_rebuild_header(struct sk_buff *skb)
 __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
 
-        struct trh_hdr *trh=(struct trh_hdr *)skb->data;
+        struct trh_hdr *trh;
         struct trllc *trllc;
         unsigned riflen=0;
 
-        skb->mac.raw = skb->data;
+        skb->dev = dev;
+        skb_reset_mac_header(skb);
+        trh = tr_hdr(skb);
 
         if(trh->saddr[0] & TR_RII)
                 riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
@@ -552,7 +554,8 @@ static int rif_seq_show(struct seq_file *seq, void *v)
                                         if(j==1) {
                                                 segment=ntohs(entry->rseg[j-1])>>4;
                                                 seq_printf(seq,"  %03X",segment);
-                                        };
+                                        }
+
                                         segment=ntohs(entry->rseg[j])>>4;
                                         brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
                                         seq_printf(seq,"-%01X-%03X",brdgnmb,segment);