summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Denis-Courmont <remi.denis-courmont@nokia.com>2008-10-27 07:06:31 +0100
committerDavid S. Miller <davem@davemloft.net>2008-10-27 07:06:31 +0100
commite214a8cc7a81f20ed7cb4f6373cf15048556bbac (patch)
tree2a822179aba3a05d9b3c2862a2235448cf220dcf
parentMerge branch 'for-linus' of git://neil.brown.name/md (diff)
downloadlinux-e214a8cc7a81f20ed7cb4f6373cf15048556bbac.tar.xz
linux-e214a8cc7a81f20ed7cb4f6373cf15048556bbac.zip
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>
-rw-r--r--include/net/phonet/phonet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index d4e72508e145..c6a245184460 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