Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ea2f10a3c81724701fe6a754789eafd50b33909f
Commit:     ea2f10a3c81724701fe6a754789eafd50b33909f
Parent:     038890fed8d1fa95bbbdeb517f5710eb75fa9e2e
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 5 16:04:04 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Apr 25 22:28:34 2007 -0700

    [XFRM]: beet: minor cleanups
    
    Remove unnecessary initialization/variable.
    
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/xfrm4_mode_beet.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 3650e02..0f7c3e3 100644
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -29,7 +29,7 @@
  */
 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;
 
        iph = ip_hdr(skb);
@@ -73,11 +73,9 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct 
sk_buff *skb)
        struct iphdr *iph = ip_hdr(skb);
        int phlen = 0;
        int optlen = 0;
-       __u8 ph_nexthdr = 0, protocol = 0;
+       u8 ph_nexthdr = 0;
        int err = -EINVAL;
 
-       protocol = iph->protocol;
-
        if (unlikely(iph->protocol == IPPROTO_BEETPH)) {
                struct ip_beet_phdr *ph;
 
@@ -109,8 +107,6 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct 
sk_buff *skb)
        iph->saddr = x->sel.saddr.a4;
        if (ph_nexthdr)
                iph->protocol = ph_nexthdr;
-       else
-               iph->protocol = protocol;
        iph->check = 0;
        iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl);
        err = 0;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to