OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf29576
07f12b2
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Sat, 2 Mar 2019 20:54:35 +0000
(12:54 -0800)
committer
David S. Miller
<davem@davemloft.net>
Sat, 2 Mar 2019 20:54:35 +0000
(12:54 -0800)
28 files changed:
1
2
drivers/net/dsa/lantiq_gswip.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/mv88e6xxx/chip.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/mv88e6xxx/port.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnxt/bnxt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/phy/dp83867.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/phy/micrel.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/phy/phylink.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/tun.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/xen-netback/netback.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/bpf/syscall.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/bpf/verifier.c
patch
|
diff1
|
diff2
|
blob
|
history
net/dsa/dsa2.c
patch
|
diff1
|
diff2
|
blob
|
history
net/dsa/port.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/icmp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ip_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mpls/af_mpls.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sched/act_ipt.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sched/act_skbedit.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sched/act_tunnel_key.c
patch
|
diff1
|
diff2
|
blob
|
history
net/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
net/tipc/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/dsa/lantiq_gswip.c
Simple merge
diff --cc
drivers/net/dsa/mv88e6xxx/chip.c
Simple merge
diff --cc
drivers/net/dsa/mv88e6xxx/port.c
Simple merge
diff --cc
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
Simple merge
diff --cc
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c
Simple merge
diff --cc
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h
Simple merge
diff --cc
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge
diff --cc
drivers/net/phy/dp83867.c
Simple merge
diff --cc
drivers/net/phy/micrel.c
Simple merge
diff --cc
drivers/net/phy/phylink.c
Simple merge
diff --cc
drivers/net/tun.c
Simple merge
diff --cc
drivers/net/xen-netback/netback.c
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge
diff --cc
kernel/bpf/syscall.c
Simple merge
diff --cc
kernel/bpf/verifier.c
Simple merge
diff --cc
net/dsa/dsa2.c
Simple merge
diff --cc
net/dsa/port.c
Simple merge
diff --cc
net/ipv4/icmp.c
Simple merge
diff --cc
net/ipv4/ip_input.c
Simple merge
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv6/route.c
Simple merge
diff --cc
net/mpls/af_mpls.c
Simple merge
diff --cc
net/sched/act_ipt.c
Simple merge
diff --cc
net/sched/act_skbedit.c
Simple merge
diff --cc
net/sched/act_tunnel_key.c
index
fc2b884
,
3f943de
..
2a5f215
---
1
/
net/sched/act_tunnel_key.c
---
2
/
net/sched/act_tunnel_key.c
+++ b/
net/sched/act_tunnel_key.c
@@@
-388,13
-376,9
+388,14
@@@
static int tunnel_key_init(struct net *
return ret;
+release_dst_cache:
+#ifdef CONFIG_DST_CACHE
+ if (metadata)
+ dst_cache_destroy(&metadata->u.tun_info.dst_cache);
+#endif
release_tun_meta:
- dst_release(&metadata->dst);
+ if (metadata)
+ dst_release(&metadata->dst);
err_out:
if (exists)
diff --cc
net/socket.c
Simple merge
diff --cc
net/tipc/socket.c
Simple merge