diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /include/net/lapb.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/net/lapb.h')
| -rw-r--r-- | include/net/lapb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/lapb.h b/include/net/lapb.h index 96cb5ddaa9f1..fd2bf572ee1d 100644 --- a/include/net/lapb.h +++ b/include/net/lapb.h | |||
| @@ -95,7 +95,7 @@ struct lapb_cb { | |||
| 95 | struct sk_buff_head write_queue; | 95 | struct sk_buff_head write_queue; |
| 96 | struct sk_buff_head ack_queue; | 96 | struct sk_buff_head ack_queue; |
| 97 | unsigned char window; | 97 | unsigned char window; |
| 98 | struct lapb_register_struct callbacks; | 98 | const struct lapb_register_struct *callbacks; |
| 99 | 99 | ||
| 100 | /* FRMR control information */ | 100 | /* FRMR control information */ |
| 101 | struct lapb_frame frmr_data; | 101 | struct lapb_frame frmr_data; |