Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 10 Sep 2010 05:27:33 +0000 (22:27 -0700)]
Conflicts:
net/mac80211/main.c

38 files changed:
1  2 
MAINTAINERS
drivers/firewire/net.c
drivers/net/3c59x.c
drivers/net/b44.c
drivers/net/benet/be.h
drivers/net/benet/be_ethtool.c
drivers/net/benet/be_main.c
drivers/net/niu.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pxa168_eth.c
drivers/net/qlcnic/qlcnic_main.c
drivers/net/qlge/qlge_main.c
drivers/net/stmmac/stmmac_main.c
drivers/net/via-velocity.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/p54/txrx.c
drivers/usb/atm/cxacru.c
include/linux/pci_ids.h
include/net/sock.h
include/net/tcp.h
net/caif/cfrfml.c
net/core/dev.c
net/core/skbuff.c
net/ipv4/Kconfig
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_timer.c
net/ipv4/udp.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/reassembly.c
net/l2tp/l2tp_eth.c
net/mac80211/main.c
net/netfilter/ipvs/ip_vs_core.c
net/sctp/sm_statefuns.c
net/unix/af_unix.c
net/wireless/core.c
net/wireless/wext-core.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge