summaryrefslogtreecommitdiff
path: root/net/netfilter/nf_conntrack_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-10-26 06:52:36 +0300
committerDavid S. Miller <davem@davemloft.net>2019-10-26 06:52:36 +0300
commit0629d2456ae3bfb374fdc686abb30b73294e4f99 (patch)
treec0e24eb3ea0fe6ab9ebdea297ae4a792fc34b858 /net/netfilter/nf_conntrack_core.c
parente4b5c7a582a75f1de54620447854bc5a29011637 (diff)
parent63ad1cd68071d56d9ed99ed35f622513005f71dc (diff)
downloadlinux-0629d2456ae3bfb374fdc686abb30b73294e4f99.tar.xz
Merge branch 'ionic-updates'
Shannon Nelson says: ==================== ionic updates These are a few of the driver updates we've been working on internally. These clean up a few mismatched struct comments, add checking for dead firmware, fix an initialization bug, and change the Rx buffer management. These are based on net-next v5.4-rc3-709-g985fd98ab5cc. v2: clear napi->skb in the error case in ionic_rx_frags() ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
0 files changed, 0 insertions, 0 deletions