diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 08:41:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 08:41:13 -0700 |
| commit | 6634160abfdbac39bd5ebda516b15b078a0f598e (patch) | |
| tree | 85a570445d953f011b4d00595868f449ac652028 /include | |
| parent | 526719ba51e7d7bd31f7af9ab04b015b70096685 (diff) | |
| parent | 8b5f12d04b2e93842f3dda01f029842047bf3f81 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
syncookies: fix inclusion of tcp options in syn-ack
libertas: free sk_buff with kfree_skb
btsdio: free sk_buff with kfree_skb
Phonet: do not reply to indication reset packets
Phonet: include generic link-layer header size in MAX_PHONET_HEADER
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phonet.h | 1 | ||||
| -rw-r--r-- | include/net/phonet/phonet.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index c9609f9aeda..4157faa857b 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h @@ -72,6 +72,7 @@ struct phonetmsg { } pn_msg_u; }; #define PN_COMMON_MESSAGE 0xF0 +#define PN_COMMGR 0x10 #define PN_PREFIX 0xE0 /* resource for extended messages */ #define pn_submsg_id pn_msg_u.base.pn_submsg_id #define pn_e_submsg_id pn_msg_u.ext.pn_e_submsg_id 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 |