OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cbd9da7
053d8f6
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
David S. Miller
<davem@davemloft.net>
Fri, 10 Sep 2010 05:27:33 +0000
(22:27 -0700)
committer
David S. Miller
<davem@davemloft.net>
Fri, 10 Sep 2010 05:27:33 +0000
(22:27 -0700)
Conflicts:
net/mac80211/main.c
38 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/firewire/net.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/3c59x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/b44.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_ethtool.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/benet/be_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/niu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/pcmcia/pcnet_cs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/pxa168_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/qlcnic/qlcnic_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/qlge/qlge_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/stmmac/stmmac_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/via-velocity.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ath/ath5k/base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_sdio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/p54/txrx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/atm/cxacru.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/pci_ids.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/sock.h
patch
|
diff1
|
diff2
|
blob
|
history
include/net/tcp.h
patch
|
diff1
|
diff2
|
blob
|
history
net/caif/cfrfml.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/skbuff.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/tcp_timer.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/udp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/netfilter/nf_conntrack_reasm.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/reassembly.c
patch
|
diff1
|
diff2
|
blob
|
history
net/l2tp/l2tp_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/main.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/ipvs/ip_vs_core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sctp/sm_statefuns.c
patch
|
diff1
|
diff2
|
blob
|
history
net/unix/af_unix.c
patch
|
diff1
|
diff2
|
blob
|
history
net/wireless/core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/wireless/wext-core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/firewire/net.c
Simple merge
diff --cc
drivers/net/3c59x.c
Simple merge
diff --cc
drivers/net/b44.c
Simple merge
diff --cc
drivers/net/benet/be.h
Simple merge
diff --cc
drivers/net/benet/be_ethtool.c
Simple merge
diff --cc
drivers/net/benet/be_main.c
Simple merge
diff --cc
drivers/net/niu.c
Simple merge
diff --cc
drivers/net/pcmcia/pcnet_cs.c
Simple merge
diff --cc
drivers/net/pxa168_eth.c
Simple merge
diff --cc
drivers/net/qlcnic/qlcnic_main.c
Simple merge
diff --cc
drivers/net/qlge/qlge_main.c
Simple merge
diff --cc
drivers/net/stmmac/stmmac_main.c
Simple merge
diff --cc
drivers/net/via-velocity.c
Simple merge
diff --cc
drivers/net/wireless/ath/ath5k/base.c
Simple merge
diff --cc
drivers/net/wireless/libertas/if_sdio.c
Simple merge
diff --cc
drivers/net/wireless/p54/txrx.c
Simple merge
diff --cc
drivers/usb/atm/cxacru.c
Simple merge
diff --cc
include/linux/pci_ids.h
Simple merge
diff --cc
include/net/sock.h
Simple merge
diff --cc
include/net/tcp.h
Simple merge
diff --cc
net/caif/cfrfml.c
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/skbuff.c
Simple merge
diff --cc
net/ipv4/Kconfig
Simple merge
diff --cc
net/ipv4/route.c
Simple merge
diff --cc
net/ipv4/tcp.c
Simple merge
diff --cc
net/ipv4/tcp_timer.c
Simple merge
diff --cc
net/ipv4/udp.c
Simple merge
diff --cc
net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge
diff --cc
net/ipv6/reassembly.c
Simple merge
diff --cc
net/l2tp/l2tp_eth.c
Simple merge
diff --cc
net/mac80211/main.c
index
a06b6ee
,
ded5c38
..
4935b84
---
1
/
net/mac80211/main.c
---
2
/
net/mac80211/main.c
+++ b/
net/mac80211/main.c
@@@
-850,7
-732,12
+850,13
@@@
void ieee80211_unregister_hw(struct iee
rtnl_unlock();
+ /*
+ * Now all work items will be gone, but the
+ * timer might still be armed, so delete it
+ */
+ del_timer_sync(&local->work_timer);
+
+ cancel_work_sync(&local->restart_work);
cancel_work_sync(&local->reconfig_filter);
ieee80211_clear_tx_pending(local);
diff --cc
net/netfilter/ipvs/ip_vs_core.c
Simple merge
diff --cc
net/sctp/sm_statefuns.c
Simple merge
diff --cc
net/unix/af_unix.c
Simple merge
diff --cc
net/wireless/core.c
Simple merge
diff --cc
net/wireless/wext-core.c
Simple merge