diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 18:45:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 18:45:19 -0400 |
| commit | 4a4f8fdba6f5a34ca90f426021e17491a30202da (patch) | |
| tree | 6eb8be6c9542845321252b1d64394a2c2ea84dd0 /include/linux/netlink.h | |
| parent | 2c6e5a839f92591a4bc6cac4a575d42151645af3 (diff) | |
| parent | 90f66914c89b0be63548d4387d1211280aa7bc8e (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/netlink.h')
| -rw-r--r-- | include/linux/netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 561d4dc75836..3029cad63a01 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
| @@ -147,7 +147,7 @@ struct netlink_callback | |||
| 147 | int (*dump)(struct sk_buff * skb, struct netlink_callback *cb); | 147 | int (*dump)(struct sk_buff * skb, struct netlink_callback *cb); |
| 148 | int (*done)(struct netlink_callback *cb); | 148 | int (*done)(struct netlink_callback *cb); |
| 149 | int family; | 149 | int family; |
| 150 | long args[4]; | 150 | long args[5]; |
| 151 | }; | 151 | }; |
| 152 | 152 | ||
| 153 | struct netlink_notify | 153 | struct netlink_notify |