leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IPV4]: Remove unused ip_options->is_data.

Browse Source 
ip_options->is_data is assigned only and never checked. The structure is
not a part of kernel interface to the userspace. So, it is safe to remove
this field.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-03-22 16:35:29 -07:00 committed by David S. Miller
parent 10fe7d85e2
commit ef722495c8
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/inet_sock.h
View File

@ -43,8 +43,7 @@ struct ip_options {
unsigned char srr; unsigned char srr;
unsigned char rr; unsigned char rr;
unsigned char ts; unsigned char ts;
unsigned char is_data:1, unsigned char is_strictroute:1,
is_strictroute:1,
srr_is_hit:1, srr_is_hit:1,
is_changed:1, is_changed:1,
rr_needaddr:1, rr_needaddr:1,

1
net/ipv4/cipso_ipv4.c
View File

@ -1800,7 +1800,6 @@ int cipso_v4_sock_setattr(struct sock *sk,
} }
memcpy(opt->__data, buf, buf_len); memcpy(opt->__data, buf, buf_len);
opt->optlen = opt_len; opt->optlen = opt_len;
opt->is_data = 1;
opt->cipso = sizeof(struct iphdr); opt->cipso = sizeof(struct iphdr);
kfree(buf); kfree(buf);
buf = NULL; buf = NULL;

5
net/ipv4/ip_options.c
View File

@ -45,7 +45,6 @@ void ip_options_build(struct sk_buff * skb, struct ip_options * opt,
memcpy(&(IPCB(skb)->opt), opt, sizeof(struct ip_options)); memcpy(&(IPCB(skb)->opt), opt, sizeof(struct ip_options));
memcpy(iph+sizeof(struct iphdr), opt->__data, opt->optlen); memcpy(iph+sizeof(struct iphdr), opt->__data, opt->optlen);
opt = &(IPCB(skb)->opt); opt = &(IPCB(skb)->opt);
opt->is_data = 0;
if (opt->srr) if (opt->srr)
memcpy(iph+opt->srr+iph[opt->srr+1]-4, &daddr, 4); memcpy(iph+opt->srr+iph[opt->srr+1]-4, &daddr, 4);
@ -95,8 +94,6 @@ int ip_options_echo(struct ip_options * dopt, struct sk_buff * skb)
memset(dopt, 0, sizeof(struct ip_options)); memset(dopt, 0, sizeof(struct ip_options));
dopt->is_data = 1;
sopt = &(IPCB(skb)->opt); sopt = &(IPCB(skb)->opt);
if (sopt->optlen == 0) { if (sopt->optlen == 0) {
@ -265,7 +262,6 @@ int ip_options_compile(struct ip_options * opt, struct sk_buff * skb)
iph = skb_network_header(skb); iph = skb_network_header(skb);
opt->optlen = ((struct iphdr *)iph)->ihl*4 - sizeof(struct iphdr); opt->optlen = ((struct iphdr *)iph)->ihl*4 - sizeof(struct iphdr);
optptr = iph + sizeof(struct iphdr); optptr = iph + sizeof(struct iphdr);
opt->is_data = 0;
} else { } else {
optptr = opt->__data; optptr = opt->__data;
iph = optptr - sizeof(struct iphdr); iph = optptr - sizeof(struct iphdr);
@ -519,7 +515,6 @@ static int ip_options_get_finish(struct ip_options **optp,
while (optlen & 3) while (optlen & 3)
opt->__data[optlen++] = IPOPT_END; opt->__data[optlen++] = IPOPT_END;
opt->optlen = optlen; opt->optlen = optlen;
opt->is_data = 1;
if (optlen && ip_options_compile(opt, NULL)) { if (optlen && ip_options_compile(opt, NULL)) {
kfree(opt); kfree(opt);
return -EINVAL; return -EINVAL;