xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IPV4]: Always pass ip_options pointer into ip_options_compile.

Browse Source 
This makes code a bit more uniform and straigthforward.

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:36:20 -07:00
committed by David S. Miller
parent ef722495c8
commit 22aba383ce
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/ipv4/ip_options.c
View File

@@ -255,17 +255,14 @@ int ip_options_compile(struct ip_options * opt, struct sk_buff * skb)
unsigned char * optptr;
int optlen;
unsigned char * pp_ptr = NULL;
struct rtable *rt = skb ? skb->rtable : NULL;
struct rtable *rt = NULL;
if (!opt) {
opt = &(IPCB(skb)->opt);
iph = skb_network_header(skb);
opt->optlen = ((struct iphdr *)iph)->ihl*4 - sizeof(struct iphdr);
optptr = iph + sizeof(struct iphdr);
} else {
if (skb != NULL) {
rt = skb->rtable;
optptr = (unsigned char *)&(ip_hdr(skb)[1]);
} else
optptr = opt->__data;
iph = optptr - sizeof(struct iphdr);
}
iph = optptr - sizeof(struct iphdr);
for (l = opt->optlen; l > 0; ) {
switch (*optptr) {