projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: Make all initialized struct seq_operations const.
[deliverable/linux.git]
/
net
/
802
/
tr.c
diff --git
a/net/802/tr.c
b/net/802/tr.c
index 96bd14452c55826fb1875e1b59dbd3ac691e2b58..e56e61a7f5450ad783aa92a510dafab0a7309069 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)
{
__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;
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;
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);
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);
segment=ntohs(entry->rseg[j])>>4;
brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
@@
-564,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,
.start = rif_seq_start,
.next = rif_seq_next,
.stop = rif_seq_stop,
This page took
0.028109 seconds
and
5
git commands to generate.