The following commit has been merged in the master branch: commit eb3e9d097b83ed3ab6a1c6a5073800c8ebfecc6e Author: Sven Eckelmann sven@narfation.org Date: Sun Apr 3 22:34:19 2011 +0200

batmand: Use non-blocking ioctl to fix FTBFS with linux >= 2.6.35

The batgat ioctl locks the used data structures itself and does not rely on the BKL. The BKL ioctl handler was removed in v2.6.35 can cannot be used anymore.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/linux/modules/gateway.c b/linux/modules/gateway.c index aa58688..63456aa 100644 --- a/linux/modules/gateway.c +++ b/linux/modules/gateway.c @@ -53,7 +53,7 @@ static int proc_clients_read(char *buf, char **start, off_t offset, int size, in static struct file_operations fops = { .open = batgat_open, .release = batgat_release, - .ioctl = batgat_ioctl, + .unlocked_ioctl = batgat_ioctl, };