diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 08:09:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-10 08:09:41 -0800 |
| commit | 4b0955a6edb9b058ca1314ca210a92ee166c4d9a (patch) | |
| tree | 735e60ef67484b67432f2c81babab5bd37cb60ab /include | |
| parent | 5bc159e6cb7ca8d173195919ee935885c129011e (diff) | |
| parent | bab1deea308afcf9200837d6ac20aefe92972efb (diff) | |
| download | linux-4b0955a6edb9b058ca1314ca210a92ee166c4d9a.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netlink.h | 3 | ||||
| -rw-r--r-- | include/net/irda/irlap.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 6a2ccf78a35640..c256ebe2a7b448 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -160,7 +160,8 @@ extern int netlink_unregister_notifier(struct notifier_block *nb); /* finegrained unicast helpers: */ struct sock *netlink_getsockbyfilp(struct file *filp); -int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo); +int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, + long timeo, struct sock *ssk); void netlink_detachskb(struct sock *sk, struct sk_buff *skb); int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol); diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index f55e86e75030e1..2127cae1e0a68d 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h @@ -50,6 +50,9 @@ /* May be different when we get VFIR */ #define LAP_MAX_HEADER (LAP_ADDR_HEADER + LAP_CTRL_HEADER) +/* Each IrDA device gets a random 32 bits IRLAP device address */ +#define LAP_ALEN 4 + #define BROADCAST 0xffffffff /* Broadcast device address */ #define CBROADCAST 0xfe /* Connection broadcast address */ #define XID_FORMAT 0x01 /* Discovery XID format */ |