Attachment #277593 for bug #304037

View | Details | Raw Unified | Return to bug 304037
Collapse All | Expand All

Lines 47-53 struct nfgenmsg { Link Here

(-)a/include/linux/netfilter/nfnetlink.h (-1 / +2 lines)
47	#define NFNL_SUBSYS_QUEUE 3	47	#define NFNL_SUBSYS_QUEUE 3
48	#define NFNL_SUBSYS_ULOG 4	48	#define NFNL_SUBSYS_ULOG 4
49	#define NFNL_SUBSYS_OSF 5	49	#define NFNL_SUBSYS_OSF 5
50	#define NFNL_SUBSYS_COUNT 6	50	#define NFNL_SUBSYS_IPSET 6
		51	#define NFNL_SUBSYS_COUNT 7
51		52
52	#ifdef __KERNEL__	53	#ifdef __KERNEL__
53		54

Lines 35-41 MODULE_LICENSE("GPL"); Link Here

(-)a/net/netfilter/nfnetlink.c (-1 / +1 lines)
35	MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");	35	MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
36	MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NETFILTER);	36	MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NETFILTER);
37		37
38	static char __initdata nfversion[] = "0.30";	38	static char __initdata nfversion[] = "0.30 with ipset netlink.patch";
39		39
40	static const struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];	40	static const struct nfnetlink_subsystem *subsys_table[NFNL_SUBSYS_COUNT];
41	static DEFINE_MUTEX(nfnl_mutex);	41	static DEFINE_MUTEX(nfnl_mutex);

Return to bug 304037

Lines 856-873 static inline int nla_put_msecs(struct sk_buff *skb, int attrtype, Link Here

(-)a/include/net/netlink.h (+9 lines)
856	#define NLA_PUT_BE16(skb, attrtype, value) \	856	#define NLA_PUT_BE16(skb, attrtype, value) \
857	NLA_PUT_TYPE(skb, __be16, attrtype, value)	857	NLA_PUT_TYPE(skb, __be16, attrtype, value)
858		858
		859	#define NLA_PUT_NET16(skb, attrtype, value) \
		860	NLA_PUT_BE16(skb, attrtype \| NLA_F_NET_BYTEORDER, value)
		861
859	#define NLA_PUT_U32(skb, attrtype, value) \	862	#define NLA_PUT_U32(skb, attrtype, value) \
860	NLA_PUT_TYPE(skb, u32, attrtype, value)	863	NLA_PUT_TYPE(skb, u32, attrtype, value)
861		864
862	#define NLA_PUT_BE32(skb, attrtype, value) \	865	#define NLA_PUT_BE32(skb, attrtype, value) \
863	NLA_PUT_TYPE(skb, __be32, attrtype, value)	866	NLA_PUT_TYPE(skb, __be32, attrtype, value)
864		867
		868	#define NLA_PUT_NET32(skb, attrtype, value) \
		869	NLA_PUT_BE32(skb, attrtype \| NLA_F_NET_BYTEORDER, value)
		870
865	#define NLA_PUT_U64(skb, attrtype, value) \	871	#define NLA_PUT_U64(skb, attrtype, value) \
866	NLA_PUT_TYPE(skb, u64, attrtype, value)	872	NLA_PUT_TYPE(skb, u64, attrtype, value)
867		873
868	#define NLA_PUT_BE64(skb, attrtype, value) \	874	#define NLA_PUT_BE64(skb, attrtype, value) \
869	NLA_PUT_TYPE(skb, __be64, attrtype, value)	875	NLA_PUT_TYPE(skb, __be64, attrtype, value)
870		876
		877	#define NLA_PUT_NET64(skb, attrtype, value) \
		878	NLA_PUT_BE64(skb, attrtype \| NLA_F_NET_BYTEORDER, value)
		879
871	#define NLA_PUT_STRING(skb, attrtype, value) \	880	#define NLA_PUT_STRING(skb, attrtype, value) \
872	NLA_PUT(skb, attrtype, strlen(value) + 1, value)	881	NLA_PUT(skb, attrtype, strlen(value) + 1, value)
873		882