From: Antonio Quartulli <antonio@meshcoding.com>
Date: Sat, 19 Oct 2013 12:06:05 +0000 (+0200)
Subject: batman-adv: check skb preparation return value
X-Git-Tag: v3.13-rc1~105^2~156^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33faa04547d7ab51700bdc3fe9b6306d93dea43f;p=pandora-kernel.git

batman-adv: check skb preparation return value

Fix bogus merge conflict resolution by checking the return
values of the skb preparation routines.

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---

Reading git-diff-tree failed