Commit ea2f10a3 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[XFRM]: beet: minor cleanups

Remove unnecessary initialization/variable.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 038890fe
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
{ {
struct iphdr *iph, *top_iph = NULL; struct iphdr *iph, *top_iph;
int hdrlen, optlen; int hdrlen, optlen;
iph = ip_hdr(skb); iph = ip_hdr(skb);
...@@ -73,11 +73,9 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -73,11 +73,9 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
int phlen = 0; int phlen = 0;
int optlen = 0; int optlen = 0;
__u8 ph_nexthdr = 0, protocol = 0; u8 ph_nexthdr = 0;
int err = -EINVAL; int err = -EINVAL;
protocol = iph->protocol;
if (unlikely(iph->protocol == IPPROTO_BEETPH)) { if (unlikely(iph->protocol == IPPROTO_BEETPH)) {
struct ip_beet_phdr *ph; struct ip_beet_phdr *ph;
...@@ -109,8 +107,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) ...@@ -109,8 +107,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
iph->saddr = x->sel.saddr.a4; iph->saddr = x->sel.saddr.a4;
if (ph_nexthdr) if (ph_nexthdr)
iph->protocol = ph_nexthdr; iph->protocol = ph_nexthdr;
else
iph->protocol = protocol;
iph->check = 0; iph->check = 0;
iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl); iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl);
err = 0; err = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment