On Thu, 2014-02-20 at 11:58 +0200, Jouni Malinen wrote: > On Thu, Feb 20, 2014 at 10:53:57AM +0100, Johannes Berg wrote: > > On Thu, 2014-02-20 at 11:49 +0200, Jouni Malinen wrote: > > > On Thu, Feb 20, 2014 at 10:39:21AM +0100, Johannes Berg wrote: > > > > Generally, the patch looks fine, but I think you need to modify mac80211 > > > > as well, and the mwifiex patch doesn't apply to my mac80211-next tree. > > > > > > How do you want to handle mwifiex then? That function is in > > > wireless-testing.git and if the cfg80211 API change goes through > > > mac80211-next that does not have mwifiex change, I'd assume the build > > > will break once that gets merged into wireless-testing (or whatever is > > > the first tree getting changes from both)? > > > > Hmm, dunno. I could merge wireless-next into mac80211-next, if that > > helps? > > It looks like the patch would apply cleanly to the current snapshot of > wireless-next, so this would likely allow cleaner path for getting this > in without leaving hidden issues for future merges. Yeah I just tried that. Once Sunil resubmits the patch with the other stuff fixed I'll merge wireless-next/master before the patch. johannes -- 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
