From: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Mon, 27 Oct 2008 06:06:31 +0000 (-0700)
Subject: Phonet: include generic link-layer header size in MAX_PHONET_HEADER
X-Git-Tag: v2.6.28-rc3~98^2~4
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e214a8cc7a81f20ed7cb4f6373cf15048556bbac;p=linux-2.6-omap-h63xx.git

Phonet: include generic link-layer header size in MAX_PHONET_HEADER

This fixes an OOPS in hard_header if a Phonet address is assigned to a
non-Phonet network interface.

Signed-off-by: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index d4e72508e14..c6a24518446 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -27,7 +27,7 @@
  * The lower layers may not require more space, ever. Make sure it's
  * enough.
  */
-#define MAX_PHONET_HEADER	8
+#define MAX_PHONET_HEADER	(8 + MAX_HEADER)
 
 /*
  * Every Phonet* socket has this structure first in its