Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / 802 / tr.c

diff --git a/net/802/tr.c b/net/802/tr.c
index 96bd14452c55826fb1875e1b59dbd3ac691e2b58..0ba1946211c935e79883963c21782f7258bb5726 100644 (file)
--- 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);