lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: nf_{conntrack,nat}_proto_gre: annotate with const

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jan Engelhardt
2008-01-31 04:52:46 -08:00
committed by David S. Miller
parent da3f13c95a
commit dc35dc5a4c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/netfilter/nf_nat_proto_gre.c
View File

@@ -104,7 +104,7 @@ gre_manip_pkt(struct sk_buff *skb, unsigned int iphdroff,
{ {
struct gre_hdr *greh; struct gre_hdr *greh;
struct gre_hdr_pptp *pgreh; struct gre_hdr_pptp *pgreh;
struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff); const struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);
unsigned int hdroff = iphdroff + iph->ihl * 4; unsigned int hdroff = iphdroff + iph->ihl * 4;
/* pgreh includes two optional 32bit fields which are not required /* pgreh includes two optional 32bit fields which are not required

6
net/netfilter/nf_conntrack_proto_gre.c
View File

@@ -161,9 +161,11 @@ static int gre_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff, unsigned int dataoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
struct gre_hdr_pptp _pgrehdr, *pgrehdr; const struct gre_hdr_pptp *pgrehdr;
struct gre_hdr_pptp _pgrehdr;
__be16 srckey; __be16 srckey;
struct gre_hdr _grehdr, *grehdr; const struct gre_hdr *grehdr;
struct gre_hdr _grehdr;
/* first only delinearize old RFC1701 GRE header */ /* first only delinearize old RFC1701 GRE header */
grehdr = skb_header_pointer(skb, dataoff, sizeof(_grehdr), &_grehdr); grehdr = skb_header_pointer(skb, dataoff, sizeof(_grehdr), &_grehdr);