projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c0f3932
802fb17
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Thu, 3 Apr 2008 05:35:23 +0000
(22:35 -0700)
committer
David S. Miller
<davem@davemloft.net>
Thu, 3 Apr 2008 05:35:23 +0000
(22:35 -0700)
Conflicts:
drivers/net/s2io.c
27 files changed:
1
2
drivers/net/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/forcedeth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/s2io.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/dm9601.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wan/lapbether.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/dma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_cs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2x00dev.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
net/8021q/vlan.c
patch
|
diff1
|
diff2
|
blob
|
history
net/8021q/vlanproc.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/l2cap.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/rfcomm/sock.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/sco.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/inet_fragment.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ip_forward.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/udp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/icmp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/ip6_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/netfilter/nf_conntrack_reasm.c
patch
|
diff1
|
diff2
|
blob
|
history
net/llc/af_llc.c
patch
|
diff1
|
diff2
|
blob
|
history
net/llc/llc_c_ac.c
patch
|
diff1
|
diff2
|
blob
|
history
net/llc/llc_input.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/ieee80211.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/ieee80211_sta.c
patch
|
diff1
|
diff2
|
blob
|
history
net/rose/af_rose.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/Kconfig
Simple merge
diff --cc
drivers/net/forcedeth.c
Simple merge
diff --cc
drivers/net/s2io.c
Simple merge
diff --cc
drivers/net/usb/dm9601.c
Simple merge
diff --cc
drivers/net/wan/lapbether.c
Simple merge
diff --cc
drivers/net/wireless/b43/dma.c
Simple merge
diff --cc
drivers/net/wireless/libertas/if_cs.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge
diff --cc
net/8021q/vlan.c
index 694be86e449014803255194d5c38206222c81044,b33410abfd6bfc25edd90a96bf05cde8014e96a3..5975ec3be7f3ae36635a802002224f7ce3015136
---
1
/
net/8021q/vlan.c
---
2
/
net/8021q/vlan.c
+++ b/
net/8021q/vlan.c
@@@
-392,9
-394,15
+404,15
@@@
static int vlan_device_event(struct not
int i, flgs;
struct net_device *vlandev;
- if (dev
->nd_net
!= &init_net)
+ if (dev
_net(dev)
!= &init_net)
return NOTIFY_DONE;
+ if (is_vlan_dev(dev)) {
+ __vlan_device_event(dev, event);
+ goto out;
+ }
+
+ grp = __vlan_find_group(dev->ifindex);
if (!grp)
goto out;
diff --cc
net/8021q/vlanproc.c
Simple merge
diff --cc
net/bluetooth/l2cap.c
Simple merge
diff --cc
net/bluetooth/rfcomm/sock.c
Simple merge
diff --cc
net/bluetooth/sco.c
Simple merge
diff --cc
net/ipv4/inet_fragment.c
Simple merge
diff --cc
net/ipv4/ip_forward.c
Simple merge
diff --cc
net/ipv4/udp.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/ipv6/icmp.c
Simple merge
diff --cc
net/ipv6/ip6_input.c
Simple merge
diff --cc
net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge
diff --cc
net/llc/af_llc.c
Simple merge
diff --cc
net/llc/llc_c_ac.c
Simple merge
diff --cc
net/llc/llc_input.c
Simple merge
diff --cc
net/mac80211/ieee80211.c
Simple merge
diff --cc
net/mac80211/ieee80211_sta.c
Simple merge
diff --cc
net/rose/af_rose.c
Simple merge