diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /Documentation/connector/cn_test.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/connector/cn_test.c')
| -rw-r--r-- | Documentation/connector/cn_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c index 1711adc33373..b07add3467f1 100644 --- a/Documentation/connector/cn_test.c +++ b/Documentation/connector/cn_test.c | |||
| @@ -34,7 +34,7 @@ static char cn_test_name[] = "cn_test"; | |||
| 34 | static struct sock *nls; | 34 | static struct sock *nls; |
| 35 | static struct timer_list cn_test_timer; | 35 | static struct timer_list cn_test_timer; |
| 36 | 36 | ||
| 37 | static void cn_test_callback(struct cn_msg *msg) | 37 | static void cn_test_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp) |
| 38 | { | 38 | { |
| 39 | pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n", | 39 | pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n", |
| 40 | __func__, jiffies, msg->id.idx, msg->id.val, | 40 | __func__, jiffies, msg->id.idx, msg->id.val, |