summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-10 08:09:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-10 08:09:41 -0800
commit4b0955a6edb9b058ca1314ca210a92ee166c4d9a (patch)
tree735e60ef67484b67432f2c81babab5bd37cb60ab /include
parent5bc159e6cb7ca8d173195919ee935885c129011e (diff)
parentbab1deea308afcf9200837d6ac20aefe92972efb (diff)
downloadop-kernel-dev-4b0955a6edb9b058ca1314ca210a92ee166c4d9a.zip
op-kernel-dev-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.h3
-rw-r--r--include/net/irda/irlap.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 6a2ccf7..c256ebe 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 f55e86e..2127cae 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 */
OpenPOWER on IntegriCloud