[ippersonality-checkins] CVS: net/ipv4/netfilter ip_personality_core.c,1.48,1.49 ip_personality_opts.c,1.26,1.27

[Carl-Daniel H. <c-d...@us...>]

Update of /cvsroot/ippersonality/net/ipv4/netfilter
In directory usw-pr-cvs1:/tmp/cvs-serv10894/netfilter

Modified Files:
	ip_personality_core.c ip_personality_opts.c 
Log Message:
fix compile warnings

Index: ip_personality_core.c
===================================================================
RCS file: /cvsroot/ippersonality/net/ipv4/netfilter/ip_personality_core.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** ip_personality_core.c	22 Jul 2001 22:00:09 -0000	1.48
--- ip_personality_core.c	27 Apr 2002 21:16:28 -0000	1.49
***************
*** 190,199 ****
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   const void *targinfo)
  
  {
    struct ip_conntrack *ct;
    enum ip_conntrack_info ctinfo;
-   struct ip_pers * pers = targinfo;
    struct tcphdr * th;
    struct iphdr * iph;
--- 190,198 ----
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   struct ip_pers *pers)
  
  {
    struct ip_conntrack *ct;
    enum ip_conntrack_info ctinfo;
    struct tcphdr * th;
    struct iphdr * iph;
***************
*** 277,285 ****
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   const void *targinfo)
  {
    struct udphdr * uh;
    struct iphdr * iph;
-   struct ip_pers *pers = targinfo;
    int ret;
    
--- 276,283 ----
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   struct ip_pers *pers)
  {
    struct udphdr * uh;
    struct iphdr * iph;
    int ret;
    
***************
*** 299,306 ****
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   const void *targinfo)
  {
    struct iphdr * iph;
-   struct ip_pers *pers = targinfo;
    int ret;
    
--- 297,303 ----
  					   const struct net_device *in,
  					   const struct net_device *out,
! 					   struct ip_pers *pers)
  {
    struct iphdr * iph;
    int ret;
    
***************
*** 322,325 ****
--- 319,323 ----
  {
    unsigned int ret;
+   struct ip_pers * pers = (struct ip_pers *)targinfo;
    
    /* not the first fragment */
***************
*** 329,340 ****
    /* TCP stuff first */
    if ((*pskb)->nh.iph->protocol == IPPROTO_TCP)
!     PERS_RET(pers_tcp_mangle(pskb, hooknum, in, out, targinfo));
  
    /* handle UDP */
    if ((*pskb)->nh.iph->protocol == IPPROTO_UDP)
!     PERS_RET(pers_udp_mangle(pskb, hooknum, in, out, targinfo));
  
    /* finally handle IP ID */
!   return pers_ip_mangle(pskb, hooknum, in, out, targinfo);
  }
  
--- 327,338 ----
    /* TCP stuff first */
    if ((*pskb)->nh.iph->protocol == IPPROTO_TCP)
!     PERS_RET(pers_tcp_mangle(pskb, hooknum, in, out, pers));
  
    /* handle UDP */
    if ((*pskb)->nh.iph->protocol == IPPROTO_UDP)
!     PERS_RET(pers_udp_mangle(pskb, hooknum, in, out, pers));
  
    /* finally handle IP ID */
!   return pers_ip_mangle(pskb, hooknum, in, out, pers);
  }
  

Index: ip_personality_opts.c
===================================================================
RCS file: /cvsroot/ippersonality/net/ipv4/netfilter/ip_personality_opts.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** ip_personality_opts.c	22 Jul 2001 14:17:30 -0000	1.26
--- ip_personality_opts.c	27 Apr 2002 21:16:28 -0000	1.27
***************
*** 280,284 ****
  	/* compute the outgoing interface */
  	if ((*pskb)->dst == NULL) {
! 	  if (!ip_route_input(*pskb, iph->daddr, iph->saddr, iph->tos, in))
  	    out = (*pskb)->dst->dev;
  	} else
--- 280,284 ----
  	/* compute the outgoing interface */
  	if ((*pskb)->dst == NULL) {
! 	  if (!ip_route_input(*pskb, iph->daddr, iph->saddr, iph->tos, (struct net_device *)in))
  	    out = (*pskb)->dst->dev;
  	} else