diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 19:52:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-27 19:52:32 -0400 |
commit | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (patch) | |
tree | 0b871e5f4cf3204c4c6243c7622c4787d56d48ee /include | |
parent | 66f03c614c0902ccf7d6160459362a9352f33271 (diff) | |
parent | 94f826b8076e2cb92242061e92f21b5baa3eccc2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Name string overrun fix in gianfar driver from Joe Perches.
2) VHOST bug fixes from Michael S. Tsirkin and Nadav Har'El
3) Fix dependencies on xt_LOG netfilter module, from Pablo Neira Ayuso.
4) Fix RCU locking in xt_CT, also from Pablo Neira Ayuso.
5) Add a parameter to skb_add_rx_frag() so we can fix the truesize
adjustments in the drivers that use it. The individual drivers
aren't fixed by this commit, but will be dealt with using follow-on
commits. From Eric Dumazet.
6) Add some device IDs to qmi_wwan driver, from Andrew Bird.
7) Fix a potential rcu_read_lock() imbalancein rt6_fill_node(). From
Eric Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: fix a potential rcu_read_lock() imbalance in rt6_fill_node()
net: add a truesize parameter to skb_add_rx_frag()
gianfar: Fix possible overrun and simplify interrupt name field creation
USB: qmi_wwan: Add ZTE (Vodafone) K3570-Z and K3571-Z net interfaces
USB: option: Ignore ZTE (Vodafone) K3570/71 net interfaces
USB: qmi_wwan: Add ZTE (Vodafone) K3565-Z and K4505-Z net interfaces
qlcnic: Bug fix for LRO
netfilter: nf_conntrack: permanently attach timeout policy to conntrack
netfilter: xt_CT: fix assignation of the generic protocol tracker
netfilter: xt_CT: missing rcu_read_lock section in timeout assignment
netfilter: cttimeout: fix dependency with l4protocol conntrack module
netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6
vhost: fix release path lockdep checks
vhost: don't forget to schedule()
tools/virtio: stub out strong barriers
tools/virtio: add linux/hrtimer.h stub
tools/virtio: add linux/module.h stub
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 2 | ||||
-rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 4 | ||||
-rw-r--r-- | include/net/netfilter/nf_conntrack_timeout.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 3fcb204a2612..192250bd49f5 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -1245,7 +1245,7 @@ static inline void skb_fill_page_desc(struct sk_buff *skb, int i, | |||
1245 | } | 1245 | } |
1246 | 1246 | ||
1247 | extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, | 1247 | extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, |
1248 | int off, int size); | 1248 | int off, int size, unsigned int truesize); |
1249 | 1249 | ||
1250 | #define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags) | 1250 | #define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags) |
1251 | #define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frag_list(skb)) | 1251 | #define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frag_list(skb)) |
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 90c67c7db7e9..3b572bb20aa2 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h | |||
@@ -118,6 +118,10 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic; | |||
118 | extern struct nf_conntrack_l4proto * | 118 | extern struct nf_conntrack_l4proto * |
119 | __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto); | 119 | __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto); |
120 | 120 | ||
121 | extern struct nf_conntrack_l4proto * | ||
122 | nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto); | ||
123 | extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p); | ||
124 | |||
121 | /* Protocol registration. */ | 125 | /* Protocol registration. */ |
122 | extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto); | 126 | extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto); |
123 | extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto); | 127 | extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto); |
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h index 0e04db4a0865..34ec89f8dbf9 100644 --- a/include/net/netfilter/nf_conntrack_timeout.h +++ b/include/net/netfilter/nf_conntrack_timeout.h | |||
@@ -15,7 +15,7 @@ struct ctnl_timeout { | |||
15 | atomic_t refcnt; | 15 | atomic_t refcnt; |
16 | char name[CTNL_TIMEOUT_NAME_MAX]; | 16 | char name[CTNL_TIMEOUT_NAME_MAX]; |
17 | __u16 l3num; | 17 | __u16 l3num; |
18 | __u8 l4num; | 18 | struct nf_conntrack_l4proto *l4proto; |
19 | char data[0]; | 19 | char data[0]; |
20 | }; | 20 | }; |
21 | 21 | ||