From: Luis R. Rodriguez Date: Wed, 8 Feb 2012 05:09:25 +0000 (-0800) Subject: mac80211: rename mesh static path_lookup() X-Git-Tag: v3.4-rc1~177^2~112^2~278 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad20dd1480dc557afcec19ac7fae5581264dd59;p=pandora-kernel.git mac80211: rename mesh static path_lookup() If you want to use mesh support from mac80211 on a recent kernel on 2.6.24 you'll run into a name clash when compiling against include/linux/namei.h, so rename this routine. /home/mcgrof/tmp/compat-wireless-3.2.5-1/net/mac80211/mesh_pathtbl.c: At top level: /home/mcgrof/tmp/compat-wireless-3.2.5-1/net/mac80211/mesh_pathtbl.c:342:26: error: conflicting types for ‘path_lookup’ include/linux/namei.h:71:12: note: previous declaration of ‘path_lookup’ was here Although this could sit as a separate patch in compat-wireless it seems best to just merge upstream. Cc: Javier Cardona Signed-off-by: Luis R. Rodriguez Acked-by: Javier Cardona Signed-off-by: John W. Linville --- Reading git-diff-tree failed