Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / net / 802 / tr.c

diff --git a/net/802/tr.c b/net/802/tr.c
index a6a6d46e708ccfb4ebd5deca6d18dc3f7bd574eb..e56e61a7f5450ad783aa92a510dafab0a7309069 100644 (file)
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -193,7 +193,8 @@ __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
        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)
@@ -553,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);
@@ -565,7 +567,7 @@ static int rif_seq_show(struct seq_file *seq, void *v)
 }
 
 
-static struct seq_operations rif_seq_ops = {
+static const struct seq_operations rif_seq_ops = {
        .start = rif_seq_start,
        .next  = rif_seq_next,
        .stop  = rif_seq_stop,