diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 13:53:55 -0400 |
| commit | 05e97a9eda72d58dba293857df6aac62584ef99a (patch) | |
| tree | e86e692f26d4879ff2210c54722e2b7780210249 /net/ipv4/udp_impl.h | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | d4ed3b9015b5eebc90d629579d9e7944607cbae5 (diff) | |
Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD
From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.
tango fixes:
* Add missing MODULE_DEVICE_TABLE() in tango_nand.c
* Update the number of corrected bitflips
core fixes:
* Fix a long standing memory leak in nand_scan_tail()
* Fix several bugs introduced by the per-vendor init/detection
infrastructure (introduced in 4.12)
* Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""
Diffstat (limited to 'net/ipv4/udp_impl.h')
| -rw-r--r-- | net/ipv4/udp_impl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/udp_impl.h b/net/ipv4/udp_impl.h index feb50a16398d..a8cf8c6fb60c 100644 --- a/net/ipv4/udp_impl.h +++ b/net/ipv4/udp_impl.h | |||
| @@ -25,7 +25,6 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, | |||
| 25 | int flags, int *addr_len); | 25 | int flags, int *addr_len); |
| 26 | int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, | 26 | int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, |
| 27 | int flags); | 27 | int flags); |
| 28 | int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); | ||
| 29 | void udp_destroy_sock(struct sock *sk); | 28 | void udp_destroy_sock(struct sock *sk); |
| 30 | 29 | ||
| 31 | #ifdef CONFIG_PROC_FS | 30 | #ifdef CONFIG_PROC_FS |