diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-01 03:07:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-01 03:07:16 +0200 |
| commit | b6f875a8d95e440369845ad43589eda401c30079 (patch) | |
| tree | e8efd00b0b704e18a4bcc63e3c88146375aaf032 /drivers/net/macsec.c | |
| parent | Merge branch 'net-ipa-three-bug-fixes' (diff) | |
| parent | netfilter: nf_osf: avoid passing pointer to local var (diff) | |
| download | linux-b6f875a8d95e440369845ad43589eda401c30079.tar.xz linux-b6f875a8d95e440369845ad43589eda401c30079.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Do not update the UDP checksum when it's zero, from Guillaume Nault.
2) Fix return of local variable in nf_osf, from Arnd Bergmann.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macsec.c')
0 files changed, 0 insertions, 0 deletions