View | Details | Raw Unified | Return to bug 95211 | Differences between
and this patch

Collapse All | Expand All

(-)a/include/net/xfrm.h (+3 lines)
Lines 1805-1810 static inline int xfrm_tunnel_check(struct sk_buff *skb, struct xfrm_state *x, Link Here
1805 
			tunnel = true;
 1805 
			tunnel = true;
1806 
		break;
 1806 
		break;
1807 
	}
 1807 
	}
1808 
	if (tunnel && !x->outer_mode) {
1809 
		printk("%s: ->outer_mode NULL: x %p\n", __func__, x);
1810 
	}
1808 
	if (tunnel && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL))
 1811 
	if (tunnel && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL))
1809 
		return -EINVAL;
 1812 
		return -EINVAL;
1810 

          1813
          

        



(-)a/net/xfrm/xfrm_state.c
      (+2 lines)




  

    
      
            Lines 851-856
          found:
      
      
        Link Here
      
    
  

        

          851
          

          851
          

        

        

          852
          
		if (km_query(x, tmpl, pol) == 0) {

          852
          
		if (km_query(x, tmpl, pol) == 0) {

        

        

          853
          
			x->km.state = XFRM_STATE_ACQ;

          853
          
			x->km.state = XFRM_STATE_ACQ;

        

            

              
              
              854
              
			printk("XFRM_STATE_ACQ 001 x %p\n", x);

            

        

          854
          
			list_add(&x->km.all, &net->xfrm.state_all);

          855
          
			list_add(&x->km.all, &net->xfrm.state_all);

        

        

          855
          
			hlist_add_head(&x->bydst, net->xfrm.state_bydst+h);

          856
          
			hlist_add_head(&x->bydst, net->xfrm.state_bydst+h);

        

        

          856
          
			h = xfrm_src_hash(net, daddr, saddr, encap_family);

          857
          
			h = xfrm_src_hash(net, daddr, saddr, encap_family);

        

  

    
      
            Lines 1053-1058
          static struct xfrm_state *__find_acq_core(struct net *net,
      
      
        Link Here
      
    
  

        

          1053
          
		}

          1054
          
		}

        

        

          1054
          

          1055
          

        

        

          1055
          
		x->km.state = XFRM_STATE_ACQ;

          1056
          
		x->km.state = XFRM_STATE_ACQ;

        

            

              
              
              1057
              
		printk("XFRM_STATE_ACQ 002 x %p\n", x);

            

        

          1056
          
		x->id.proto = proto;

          1058
          
		x->id.proto = proto;

        

        

          1057
          
		x->props.family = family;

          1059
          
		x->props.family = family;

        

        

          1058
          
		x->props.mode = mode;

          1060
          
		x->props.mode = mode;

        






  

  Return to bug 95211