Changeset 15578


Ignore:
Timestamp:
2009-05-04T12:37:48+02:00 (9 years ago)
Author:
kaloz
Message:

refresh generic 2.6.28 patches

Location:
trunk/target/linux/generic-2.6/patches-2.6.28
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch

    r15502 r15578  
    1717--- a/include/net/netfilter/nf_conntrack.h 
    1818+++ b/include/net/netfilter/nf_conntrack.h 
    19 @@ -118,6 +118,22 @@ 
     19@@ -118,6 +118,22 @@ struct nf_conn 
    2020        u_int32_t secmark; 
    2121 #endif 
     
    4242--- a/net/netfilter/Kconfig 
    4343+++ b/net/netfilter/Kconfig 
    44 @@ -795,6 +795,27 @@ 
     44@@ -795,6 +795,27 @@ config NETFILTER_XT_MATCH_STATE 
    4545  
    4646          To compile it as a module, choose M here.  If unsure, say N. 
     
    7272--- a/net/netfilter/Makefile 
    7373+++ b/net/netfilter/Makefile 
    74 @@ -84,6 +84,7 @@ 
     74@@ -84,6 +84,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)  
    7575 obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o 
    7676 obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o 
     
    8282--- a/net/netfilter/nf_conntrack_core.c 
    8383+++ b/net/netfilter/nf_conntrack_core.c 
    84 @@ -201,6 +201,14 @@ 
     84@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n 
    8585         * too. */ 
    8686        nf_ct_remove_expectations(ct); 
     
    9999--- a/net/netfilter/nf_conntrack_standalone.c 
    100100+++ b/net/netfilter/nf_conntrack_standalone.c 
    101 @@ -165,6 +165,12 @@ 
     101@@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file * 
    102102                return -ENOSPC; 
    103103 #endif 
  • trunk/target/linux/generic-2.6/patches-2.6.28/101-netfilter_layer7_pktmatch.patch

    r15502 r15578  
    11--- a/include/linux/netfilter/xt_layer7.h 
    22+++ b/include/linux/netfilter/xt_layer7.h 
    3 @@ -8,6 +8,7 @@ 
     3@@ -8,6 +8,7 @@ struct xt_layer7_info { 
    44     char protocol[MAX_PROTOCOL_LEN]; 
    55     char pattern[MAX_PATTERN_LEN]; 
     
    1111--- a/net/netfilter/xt_layer7.c 
    1212+++ b/net/netfilter/xt_layer7.c 
    13 @@ -314,33 +314,35 @@ 
     13@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con 
    1414 } 
    1515  
     
    6161        return length; 
    6262 } 
    63 @@ -438,7 +440,7 @@ 
     63@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin, 
    6464  
    6565        enum ip_conntrack_info master_ctinfo, ctinfo; 
     
    7070        regexp * comppattern; 
    7171  
    72 @@ -466,8 +468,8 @@ 
     72@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin, 
    7373                master_conntrack = master_ct(master_conntrack); 
    7474  
     
    8181                pattern_result = match_no_append(conntrack, master_conntrack,  
    8282                                                 ctinfo, master_ctinfo, info); 
    83 @@ -500,6 +502,25 @@ 
     83@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin, 
    8484        /* the return value gets checked later, when we're ready to use it */ 
    8585        comppattern = compile_and_cache(info->pattern, info->protocol); 
  • trunk/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch

    r13546 r15578  
    2828                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, 
    2929                .features       = RTL_FEATURE_MSI 
    30 @@ -3554,10 +3554,12 @@ static irqreturn_t rtl8169_interrupt(int 
     30@@ -3555,10 +3555,12 @@ static irqreturn_t rtl8169_interrupt(int 
    3131                goto out; 
    3232        } 
  • trunk/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch

    r14949 r15578  
    6868--- a/kernel/sched.c 
    6969+++ b/kernel/sched.c 
    70 @@ -5015,6 +5015,7 @@ int can_nice(const struct task_struct *p 
     70@@ -5064,6 +5064,7 @@ int can_nice(const struct task_struct *p 
    7171        return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || 
    7272                capable(CAP_SYS_NICE)); 
Note: See TracChangeset for help on using the changeset viewer.