A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-23 13:09:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ../nf-2.6

Browse source
This commit is contained in:
Patrick McHardy 2010-03-18 12:55:50 +01:00
commit e8a96f6938
4 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/netfilter/nf_conntrack_tuple_common.h
View file

@ -1,8 +1,7 @@
#ifndef _NF_CONNTRACK_TUPLE_COMMON_H
#define _NF_CONNTRACK_TUPLE_COMMON_H
enum ip_conntrack_dir
{
enum ip_conntrack_dir {
IP_CT_DIR_ORIGINAL,
IP_CT_DIR_REPLY,
IP_CT_DIR_MAX

4
include/linux/netfilter_ipv6/ip6_tables.h
View file

@ -316,10 +316,6 @@ extern int ip6t_ext_hdr(u8 nexthdr);
extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
int target, unsigned short *fragoff);
extern int ip6_masked_addrcmp(const struct in6_addr *addr1,
const struct in6_addr *mask,
const struct in6_addr *addr2);
#define IP6T_ALIGN(s) XT_ALIGN(s)
#ifdef CONFIG_COMPAT