diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-03 03:47:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-03 03:47:16 +0300 |
| commit | b132e4a25dccf5d5857e6ce2d96541be51aa9c5e (patch) | |
| tree | 64a6474bc7c218ff228469fda4600556217939b8 /include/linux/netfilter | |
| parent | b3addcf0d1f04f53fcc302577d5a5e964c18531a (diff) | |
| parent | afbbc7913a288c29616bd31ae612548f6475151a (diff) | |
| download | linux-b132e4a25dccf5d5857e6ce2d96541be51aa9c5e.tar.xz | |
Merge tag 'fixes-for-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.12-rc4
A fix to a really old synchronization bug on mass storage gadget.
Support for Meson8 SoCs on dwc2
Synchronization fixes on renesas USB driver.
Diffstat (limited to 'include/linux/netfilter')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index be378cf47fcc..b3044c2c62cb 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -294,7 +294,7 @@ int xt_match_to_user(const struct xt_entry_match *m, int xt_target_to_user(const struct xt_entry_target *t, struct xt_entry_target __user *u); int xt_data_to_user(void __user *dst, const void *src, - int usersize, int size); + int usersize, int size, int aligned_size); void *xt_copy_counters_from_user(const void __user *user, unsigned int len, struct xt_counters_info *info, bool compat); |