Changeset 11908


Ignore:
Timestamp:
2008-07-22T15:52:56+02:00 (8 years ago)
Author:
juhosg
Message:

[kernel] fix nf_conntrack_rtsp compile error on 2.6.26 (closes #3797)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch

    r11336 r11908  
    348348--- /dev/null 
    349349+++ b/net/netfilter/nf_conntrack_rtsp.c 
    350 @@ -0,0 +1,513 @@ 
     350@@ -0,0 +1,517 @@ 
    351351+/* 
    352352+ * RTSP extension for IP connection tracking 
     
    680680+               be_loport = htons(expinfo.loport); 
    681681+ 
    682 +               nf_ct_expect_init(exp, ct->tuplehash[!dir].tuple.src.l3num, 
     682+               nf_ct_expect_init(exp, NF_CT_EXPECT_CLASS_DEFAULT, 
     683+                       ct->tuplehash[!dir].tuple.src.l3num, 
    683684+                       &ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3, 
    684685+                       IPPROTO_UDP, NULL, &be_loport); 
     
    785786+static struct nf_conntrack_helper rtsp_helpers[MAX_PORTS]; 
    786787+static char rtsp_names[MAX_PORTS][10]; 
     788+static struct nf_conntrack_expect_policy rtsp_expect_policy; 
    787789+ 
    788790+/* This function is intentionally _NOT_ defined as __exit */ 
     
    816818+       } 
    817819+ 
     820+       rtsp_expect_policy.max_expected = max_outstanding; 
     821+       rtsp_expect_policy.timeout = setup_timeout; 
     822+ 
    818823+       rtsp_buffer = kmalloc(65536, GFP_KERNEL); 
    819824+       if (!rtsp_buffer) 
     
    830835+               hlpr->tuple.src.u.tcp.port = htons(ports[i]); 
    831836+               hlpr->tuple.dst.protonum = IPPROTO_TCP; 
    832 +               hlpr->max_expected = max_outstanding; 
    833 +               hlpr->timeout = setup_timeout; 
     837+               hlpr->expect_policy = &rtsp_expect_policy; 
    834838+               hlpr->me = THIS_MODULE; 
    835839+               hlpr->help = help; 
Note: See TracChangeset for help on using the changeset viewer.