OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b1654d
aee2f54
)
Merge remote-tracking branch 'net-next/master'
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:50:16 +0000
(10:50 +1000)
committer
Stephen Rothwell
<sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:50:16 +0000
(10:50 +1000)
25 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/boot/dts/dra7.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/arcnet/arcnet.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/mv88e6xxx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/genet/bcmgenet.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/vrf.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/route.h
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/smp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_multicast.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/filter.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/rtnetlink.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/arp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_minisocks.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_output.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/xfrm4_policy.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/ip6_output.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/xfrm6_output.c
patch
|
diff1
|
diff2
|
blob
|
history
net/openvswitch/conntrack.c
patch
|
diff1
|
diff2
|
blob
|
history
net/openvswitch/datapath.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
arch/arm/boot/dts/dra7.dtsi
Simple merge
diff --cc
drivers/net/arcnet/arcnet.c
Simple merge
diff --cc
drivers/net/dsa/mv88e6xxx.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge
diff --cc
drivers/net/usb/Kconfig
Simple merge
diff --cc
drivers/net/vrf.c
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge
diff --cc
include/net/route.h
Simple merge
diff --cc
net/bluetooth/smp.c
Simple merge
diff --cc
net/bridge/br_multicast.c
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/filter.c
Simple merge
diff --cc
net/core/rtnetlink.c
Simple merge
diff --cc
net/ipv4/arp.c
index
f03db8b
,
61ff5ea
..
01308e6
---
1
/
net/ipv4/arp.c
---
2
/
net/ipv4/arp.c
+++ b/
net/ipv4/arp.c
@@@
-651,8
-654,6
+657,7
@@@
static int arp_process(struct net *net
u16 dev_type = dev->type;
int addr_type;
struct neighbour *n;
- struct net *net = dev_net(dev);
+ struct dst_entry *reply_dst = NULL;
bool is_garp = false;
/* arp_rcv below verifies the ARP header and verifies the device
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv4/tcp_minisocks.c
Simple merge
diff --cc
net/ipv4/tcp_output.c
Simple merge
diff --cc
net/ipv4/xfrm4_policy.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/ipv6/ip6_output.c
Simple merge
diff --cc
net/ipv6/route.c
Simple merge
diff --cc
net/ipv6/xfrm6_output.c
Simple merge
diff --cc
net/openvswitch/conntrack.c
Simple merge
diff --cc
net/openvswitch/datapath.c
Simple merge