diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 11:41:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-27 11:41:13 -0400 |
| commit | 6634160abfdbac39bd5ebda516b15b078a0f598e (patch) | |
| tree | 85a570445d953f011b4d00595868f449ac652028 /include/linux | |
| 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/linux')
| -rw-r--r-- | include/linux/phonet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index c9609f9aedac..4157faa857b6 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h | |||
| @@ -72,6 +72,7 @@ struct phonetmsg { | |||
| 72 | } pn_msg_u; | 72 | } pn_msg_u; |
| 73 | }; | 73 | }; |
| 74 | #define PN_COMMON_MESSAGE 0xF0 | 74 | #define PN_COMMON_MESSAGE 0xF0 |
| 75 | #define PN_COMMGR 0x10 | ||
| 75 | #define PN_PREFIX 0xE0 /* resource for extended messages */ | 76 | #define PN_PREFIX 0xE0 /* resource for extended messages */ |
| 76 | #define pn_submsg_id pn_msg_u.base.pn_submsg_id | 77 | #define pn_submsg_id pn_msg_u.base.pn_submsg_id |
| 77 | #define pn_e_submsg_id pn_msg_u.ext.pn_e_submsg_id | 78 | #define pn_e_submsg_id pn_msg_u.ext.pn_e_submsg_id |