Changeset 30646


Ignore:
Timestamp:
2012-02-19T18:01:15+01:00 (4 years ago)
Author:
jow
Message:

[backfire] generic-2.4: rebase netfilter patches after RTSP removal

Location:
branches/backfire/target/linux/generic-2.4/patches
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch

    r17844 r30646  
    11--- a/net/ipv4/netfilter/Config.in 
    22+++ b/net/ipv4/netfilter/Config.in 
    3 @@ -15,6 +15,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; 
     3@@ -14,6 +14,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; 
     4   dep_tristate '  Connection tracking flow accounting' CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK 
    45   dep_tristate '  Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES 
    56   dep_tristate '  H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK 
    6    dep_tristate '  RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK 
    77+  dep_tristate '  MMS protocol support' CONFIG_IP_NF_MMS $CONFIG_IP_NF_CONNTRACK 
    88 fi 
    99  
    1010 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
    11 @@ -96,6 +97,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    12           define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT 
     11@@ -88,6 +89,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     12          define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT 
    1313        fi 
    1414       fi 
     
    2525--- a/net/ipv4/netfilter/Makefile 
    2626+++ b/net/ipv4/netfilter/Makefile 
    27 @@ -55,6 +55,10 @@ obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack 
    28  ifdef CONFIG_IP_NF_NAT_RTSP 
    29         export-objs += ip_conntrack_rtsp.o 
     27@@ -51,6 +51,10 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack 
     28 ifdef CONFIG_IP_NF_NAT_H323 
     29        export-objs += ip_conntrack_h323.o 
    3030 endif 
    3131+obj-$(CONFIG_IP_NF_MMS) += ip_conntrack_mms.o 
     
    3434+endif 
    3535  
    36   
    3736 # NAT helpers  
    38 @@ -64,6 +68,7 @@ obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ft 
     37 obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o 
     38@@ -58,6 +62,7 @@ obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_t 
     39 obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o 
    3940 obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o 
    4041 obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o 
    41  obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o 
    4242+obj-$(CONFIG_IP_NF_NAT_MMS) += ip_nat_mms.o 
    4343  
     
    674674--- a/include/linux/netfilter_ipv4/ip_conntrack.h 
    675675+++ b/include/linux/netfilter_ipv4/ip_conntrack.h 
    676 @@ -69,6 +69,7 @@ union ip_conntrack_expect_proto { 
     676@@ -68,6 +68,7 @@ union ip_conntrack_expect_proto { 
     677 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> 
    677678 #include <linux/netfilter_ipv4/ip_conntrack_irc.h> 
    678679 #include <linux/netfilter_ipv4/ip_conntrack_h323.h> 
    679  #include <linux/netfilter_ipv4/ip_conntrack_rtsp.h> 
    680680+#include <linux/netfilter_ipv4/ip_conntrack_mms.h> 
    681681  
    682682 /* per expectation: application helper private data */ 
    683683 union ip_conntrack_expect_help { 
    684 @@ -78,6 +79,7 @@ union ip_conntrack_expect_help { 
     684@@ -76,6 +77,7 @@ union ip_conntrack_expect_help { 
     685        struct ip_ct_ftp_expect exp_ftp_info; 
    685686        struct ip_ct_irc_expect exp_irc_info; 
    686687        struct ip_ct_h225_expect exp_h225_info; 
    687         struct ip_ct_rtsp_expect exp_rtsp_info; 
    688688+       struct ip_ct_mms_expect exp_mms_info; 
    689689  
    690690 #ifdef CONFIG_IP_NF_NAT_NEEDED 
    691691        union { 
    692 @@ -93,6 +95,7 @@ union ip_conntrack_help { 
     692@@ -90,6 +92,7 @@ union ip_conntrack_help { 
     693        struct ip_ct_ftp_master ct_ftp_info; 
    693694        struct ip_ct_irc_master ct_irc_info; 
    694695        struct ip_ct_h225_master ct_h225_info; 
    695         struct ip_ct_rtsp_master ct_rtsp_info; 
    696696+       struct ip_ct_mms_master ct_mms_info; 
    697697 }; 
  • branches/backfire/target/linux/generic-2.4/patches/616-netfilter_imq.patch

    r17844 r30646  
    506506--- a/net/ipv4/netfilter/Config.in 
    507507+++ b/net/ipv4/netfilter/Config.in 
    508 @@ -141,6 +141,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     508@@ -133,6 +133,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    509509     dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE 
    510510   
     
    516516--- a/net/ipv4/netfilter/Makefile 
    517517+++ b/net/ipv4/netfilter/Makefile 
    518 @@ -118,6 +118,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO 
     518@@ -112,6 +112,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO 
    519519 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o 
    520520 obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o 
  • branches/backfire/target/linux/generic-2.4/patches/620-netfilter_iprange.patch

    r17844 r30646  
    4444--- a/net/ipv4/netfilter/Config.in 
    4545+++ b/net/ipv4/netfilter/Config.in 
    46 @@ -25,6 +25,7 @@ tristate 'IP tables support (required fo 
     46@@ -24,6 +24,7 @@ tristate 'IP tables support (required fo 
    4747 if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then 
    4848 # The simple matches. 
     
    158158--- a/net/ipv4/netfilter/Makefile 
    159159+++ b/net/ipv4/netfilter/Makefile 
    160 @@ -81,6 +81,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o 
     160@@ -75,6 +75,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o 
    161161 # matches 
    162162 obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o 
  • branches/backfire/target/linux/generic-2.4/patches/621-netfilter_random.patch

    r17844 r30646  
    7070--- a/net/ipv4/netfilter/Config.in 
    7171+++ b/net/ipv4/netfilter/Config.in 
    72 @@ -32,6 +32,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     72@@ -31,6 +31,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    7373   dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES 
    7474   dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES 
     
    179179--- a/net/ipv4/netfilter/Makefile 
    180180+++ b/net/ipv4/netfilter/Makefile 
    181 @@ -93,6 +93,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o 
     181@@ -87,6 +87,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o 
    182182 obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o 
    183183 obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o 
  • branches/backfire/target/linux/generic-2.4/patches/628-netfilter_raw.patch

    r19762 r30646  
    3838--- a/include/linux/netfilter_ipv4/ip_conntrack.h 
    3939+++ b/include/linux/netfilter_ipv4/ip_conntrack.h 
    40 @@ -286,6 +286,9 @@ extern void ip_ct_refresh_acct(struct ip 
     40@@ -283,6 +283,9 @@ extern void ip_ct_refresh_acct(struct ip 
    4141 /* Call me when a conntrack is destroyed. */ 
    4242 extern void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack); 
     
    8282--- a/net/ipv4/netfilter/Config.in 
    8383+++ b/net/ipv4/netfilter/Config.in 
    84 @@ -153,6 +153,15 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     84@@ -145,6 +145,15 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    8585   dep_tristate '  TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES 
    8686   dep_tristate '  ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES 
     
    510510--- a/net/ipv4/netfilter/Makefile 
    511511+++ b/net/ipv4/netfilter/Makefile 
    512 @@ -77,6 +77,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_table 
     512@@ -71,6 +71,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_table 
    513513 obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o 
    514514 obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o 
     
    518518 # matches 
    519519 obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o 
    520 @@ -131,6 +132,7 @@ obj-$(CONFIG_IP_NF_TARGET_CONNMARK) += i 
     520@@ -125,6 +126,7 @@ obj-$(CONFIG_IP_NF_TARGET_CONNMARK) += i 
    521521 obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o 
    522522 obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o 
  • branches/backfire/target/linux/generic-2.4/patches/630-netfilter_comment.patch

    r20721 r30646  
    7676--- a/net/ipv4/netfilter/Makefile 
    7777+++ b/net/ipv4/netfilter/Makefile 
    78 @@ -113,6 +113,7 @@ obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt 
     78@@ -107,6 +107,7 @@ obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt 
    7979 obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o 
    8080 obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o 
     
    8686--- a/net/ipv4/netfilter/Config.in 
    8787+++ b/net/ipv4/netfilter/Config.in 
    88 @@ -44,6 +44,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     88@@ -43,6 +43,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    8989   dep_tristate '  LENGTH match support' CONFIG_IP_NF_MATCH_LENGTH $CONFIG_IP_NF_IPTABLES 
    9090   dep_tristate '  TTL match support' CONFIG_IP_NF_MATCH_TTL $CONFIG_IP_NF_IPTABLES 
Note: See TracChangeset for help on using the changeset viewer.