On Fri, Jul 04, 2008 at 04:31:17AM +0100, Daniel Drake wrote: > Luis Carlos Cobo recently added beacon config code (to support mesh) > which happens also to be most of the work needed to support ad-hoc. > This patch does the rest. > > Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx> This seems to overlap with this patch that is already in -next: commit 84e6dc9acf6825f508feae9db6b7d695e64894e0 Author: Bruno Randolf <br1@xxxxxxxxxxx> Date: Wed May 7 11:46:02 2008 +0200 zd1211rw: initial IBSS support this adds initial IBSS support for the zydas zd1211rw: convince driver that it can do IBSS mode. add mac80211 beacon_update callbac IBSS merge and TSF updates don't work yet, but it makes the driver usable in ad-hoc networks. Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> Yours might be better overall. Perhaps you can reconcile with what is already in the tree and resubmit? Thanks, John -- John W. Linville linville@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html